summaryrefslogtreecommitdiffstats
path: root/noatun/modules
diff options
context:
space:
mode:
Diffstat (limited to 'noatun/modules')
-rw-r--r--noatun/modules/excellent/userinterface.cpp8
-rw-r--r--noatun/modules/excellent/userinterface.h10
-rw-r--r--noatun/modules/htmlexport/htmlexport.cpp2
-rw-r--r--noatun/modules/htmlexport/htmlexport.h4
-rw-r--r--noatun/modules/infrared/irprefs.cpp2
-rw-r--r--noatun/modules/infrared/irprefs.h4
-rw-r--r--noatun/modules/kaiman/pref.cpp2
-rw-r--r--noatun/modules/kaiman/pref.h4
-rw-r--r--noatun/modules/kaiman/userinterface.cpp4
-rw-r--r--noatun/modules/kaiman/userinterface.h2
-rw-r--r--noatun/modules/kjofol-skin/kjbutton.cpp2
-rw-r--r--noatun/modules/kjofol-skin/kjguisettingswidget.ui2
-rw-r--r--noatun/modules/marquis/marquis.cpp6
-rw-r--r--noatun/modules/marquis/marquis.h2
-rw-r--r--noatun/modules/metatag/metatag.cpp2
-rw-r--r--noatun/modules/metatag/metatag.h4
-rw-r--r--noatun/modules/monoscope/monoscope.cpp2
-rw-r--r--noatun/modules/monoscope/monoscope.h4
-rw-r--r--noatun/modules/simple/userinterface.cpp4
-rw-r--r--noatun/modules/simple/userinterface.h6
-rw-r--r--noatun/modules/splitplaylist/view.cpp24
-rw-r--r--noatun/modules/splitplaylist/view.h14
-rw-r--r--noatun/modules/systray/kitsystemtray.cpp4
-rw-r--r--noatun/modules/systray/kitsystemtray.h8
-rw-r--r--noatun/modules/systray/systray.cpp2
-rw-r--r--noatun/modules/systray/systray.h2
26 files changed, 65 insertions, 65 deletions
diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp
index f1f64a22..7d6c4bfd 100644
--- a/noatun/modules/excellent/userinterface.cpp
+++ b/noatun/modules/excellent/userinterface.cpp
@@ -62,7 +62,7 @@
#include <tqvbox.h>
Excellent::Excellent()
- : KMainWindow(0, "NoatunExcellent")
+ : TDEMainWindow(0, "NoatunExcellent")
, UserInterface()
{
setAcceptDrops(true);
@@ -82,7 +82,7 @@ Excellent::Excellent()
NoatunStdAction::forward(actionCollection(), "forward");
NoatunStdAction::playlist(actionCollection(), "show_playlist");
- volumeAction = new KToggleAction(i18n("Show &Volume Control"), 0, TQT_TQOBJECT(this), TQT_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol");
+ volumeAction = new TDEToggleAction(i18n("Show &Volume Control"), 0, TQT_TQOBJECT(this), TQT_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol");
volumeAction->setCheckedState(i18n("Hide &Volume Control"));
NoatunStdAction::effects(actionCollection(), "effects");
NoatunStdAction::equalizer(actionCollection(), "equalizer");
@@ -210,7 +210,7 @@ void Excellent::showEvent(TQShowEvent *e)
config->writeEntry("mappingState", NET::Visible);
config->sync();
- KMainWindow::showEvent(e);
+ TDEMainWindow::showEvent(e);
}
void Excellent::hideEvent(TQHideEvent *e)
@@ -220,7 +220,7 @@ void Excellent::hideEvent(TQHideEvent *e)
config->writeEntry("mappingState", NET::Withdrawn);
config->sync();
- KMainWindow::hideEvent(e);
+ TDEMainWindow::hideEvent(e);
}
void Excellent::closeEvent(TQCloseEvent *)
diff --git a/noatun/modules/excellent/userinterface.h b/noatun/modules/excellent/userinterface.h
index 0cd172a6..c47f05f1 100644
--- a/noatun/modules/excellent/userinterface.h
+++ b/noatun/modules/excellent/userinterface.h
@@ -32,22 +32,22 @@
#include <noatun/stdaction.h>
#include <kmainwindow.h>
-class KAction;
-class KPopupMenu;
+class TDEAction;
+class TDEPopupMenu;
class KStatusBar;
class Player;
class TQHBox;
class TQLabel;
class TQSlider;
class L33tSlider;
-class KToggleAction;
+class TDEToggleAction;
/**
* @short Main window class
* @author Neil Stevens <multivac@fcmail.com>
* @author Charles Samuels <charles@kde.org>
*/
-class Excellent : public KMainWindow, public UserInterface
+class Excellent : public TDEMainWindow, public UserInterface
{
Q_OBJECT
@@ -94,7 +94,7 @@ private:
TQHBox *mainFrame;
- KToggleAction *volumeAction, *menubarAction;
+ TDEToggleAction *volumeAction, *menubarAction;
L33tSlider *volumeSlider, *slider;
TQLabel *elapsed, *total;
};
diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp
index ab6c9194..27746b69 100644
--- a/noatun/modules/htmlexport/htmlexport.cpp
+++ b/noatun/modules/htmlexport/htmlexport.cpp
@@ -17,7 +17,7 @@ HTMLExport::HTMLExport(): TQObject(0, "HTMLExport"), Plugin()
{
NOATUNPLUGINC(HTMLExport);
- mAction = new KAction(i18n("&Export Playlist..."), "filesaveas", 0,
+ mAction = new TDEAction(i18n("&Export Playlist..."), "filesaveas", 0,
this, TQT_SLOT(slotExport()), this, "exportlist");
napp->pluginActionMenu()->insert(mAction);
diff --git a/noatun/modules/htmlexport/htmlexport.h b/noatun/modules/htmlexport/htmlexport.h
index 304092fb..0c3de125 100644
--- a/noatun/modules/htmlexport/htmlexport.h
+++ b/noatun/modules/htmlexport/htmlexport.h
@@ -29,7 +29,7 @@
#include <noatun/pref.h>
#include <noatun/plugin.h>
-class KAction;
+class TDEAction;
class HTMLExport : public TQObject, public Plugin
{
@@ -45,7 +45,7 @@ private:
TQString htmlEscape(const TQString &source);
TQString getColorByEntry(TQString s);
TDEConfig *config;
- KAction *mAction;
+ TDEAction *mAction;
private slots:
void slotExport();
diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp
index 36d6a8fb..a504b977 100644
--- a/noatun/modules/infrared/irprefs.cpp
+++ b/noatun/modules/infrared/irprefs.cpp
@@ -60,7 +60,7 @@ IRPrefs::IRPrefs(TQObject *parent)
TQLabel *label = new TQLabel(i18n("Remote control &commands:"), this);
layout->addMultiCellWidget(label, 0, 0, 0, 4);
- label->setBuddy(m_commands = new KListView(this));
+ label->setBuddy(m_commands = new TDEListView(this));
layout->addMultiCellWidget(m_commands, 1, 1, 0, 4);
label = new TQLabel(i18n("&Action:"), this);
diff --git a/noatun/modules/infrared/irprefs.h b/noatun/modules/infrared/irprefs.h
index 3554ae01..6646456e 100644
--- a/noatun/modules/infrared/irprefs.h
+++ b/noatun/modules/infrared/irprefs.h
@@ -7,7 +7,7 @@
class TQCheckBox;
class TQListViewItem;
-class KListView;
+class TDEListView;
class KComboBox;
class KIntSpinBox;
class Lirc;
@@ -45,7 +45,7 @@ private slots:
private:
static void readConfig();
- KListView *m_commands;
+ TDEListView *m_commands;
KComboBox *m_action;
TQCheckBox *m_repeat;
KIntSpinBox *m_interval;
diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp
index cdee37c0..4d74d858 100644
--- a/noatun/modules/kaiman/pref.cpp
+++ b/noatun/modules/kaiman/pref.cpp
@@ -39,7 +39,7 @@ KaimanPrefDlg::KaimanPrefDlg(TQObject *parent )
TQLabel *label = new TQLabel( i18n("Kaiman Skins"), this, "label" );
topLayout->addWidget( label );
- _skinList = new KListBox( this, "skinList" );
+ _skinList = new TDEListBox( this, "skinList" );
topLayout->addWidget( _skinList, 1 );
reopen();
}
diff --git a/noatun/modules/kaiman/pref.h b/noatun/modules/kaiman/pref.h
index 19895bff..50ab3808 100644
--- a/noatun/modules/kaiman/pref.h
+++ b/noatun/modules/kaiman/pref.h
@@ -21,7 +21,7 @@
#include <noatun/pref.h>
-class KListBox;
+class TDEListBox;
class TQLabel;
class KaimanPrefDlg : public CModule
@@ -42,7 +42,7 @@ class KaimanPrefDlg : public CModule
private:
void readSkinDir( const TQString &dir );
- KListBox *_skinList;
+ TDEListBox *_skinList;
};
#endif
diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp
index 56eb389e..ef6d30ce 100644
--- a/noatun/modules/kaiman/userinterface.cpp
+++ b/noatun/modules/kaiman/userinterface.cpp
@@ -65,7 +65,7 @@ Kaiman* Kaiman::kaiman=0;
const char Kaiman::DEFAULT_SKIN[]="car-preset";
Kaiman::Kaiman()
- : KMainWindow(0, "NoatunKaiman"), UserInterface()
+ : TDEMainWindow(0, "NoatunKaiman"), UserInterface()
{
NOATUNPLUGINC(Kaiman);
kaiman=this;
@@ -531,7 +531,7 @@ void Kaiman::newSong()
#undef None
void Kaiman::toggleLoop()
{
- KPopupMenu *loopMenu = new KPopupMenu(this, "loopMenu");
+ TDEPopupMenu *loopMenu = new TDEPopupMenu(this, "loopMenu");
int selectedItem = 0;
loopMenu->setCheckable(true);
diff --git a/noatun/modules/kaiman/userinterface.h b/noatun/modules/kaiman/userinterface.h
index aac209f3..aa681c3c 100644
--- a/noatun/modules/kaiman/userinterface.h
+++ b/noatun/modules/kaiman/userinterface.h
@@ -32,7 +32,7 @@ class Player;
* @author Stefan Schimanski <1Stein@gmx.de>
* @version 0.1
*/
-class Kaiman : public KMainWindow, public UserInterface
+class Kaiman : public TDEMainWindow, public UserInterface
{
Q_OBJECT
diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp
index 7cdfc0e2..f6c60256 100644
--- a/noatun/modules/kjofol-skin/kjbutton.cpp
+++ b/noatun/modules/kjofol-skin/kjbutton.cpp
@@ -222,7 +222,7 @@ void KJButton::mouseRelease(const TQPoint &, bool in)
napp->player()->toggleListView();
else if (mTitle=="repeatbutton")
{
- KPopupMenu *loopMenu = new KPopupMenu(KJWidget::parent(),"loopMenu");
+ TDEPopupMenu *loopMenu = new TDEPopupMenu(KJWidget::parent(),"loopMenu");
int selectedItem = 0;
loopMenu->setCheckable(true);
diff --git a/noatun/modules/kjofol-skin/kjguisettingswidget.ui b/noatun/modules/kjofol-skin/kjguisettingswidget.ui
index 934285fa..244e67a2 100644
--- a/noatun/modules/kjofol-skin/kjguisettingswidget.ui
+++ b/noatun/modules/kjofol-skin/kjguisettingswidget.ui
@@ -397,7 +397,7 @@
<string>Font:</string>
</property>
</widget>
- <widget class="KFontCombo" row="1" column="1">
+ <widget class="TDEFontCombo" row="1" column="1">
<property name="name">
<cstring>cmbSysFont</cstring>
</property>
diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp
index e3faf8b1..71612174 100644
--- a/noatun/modules/marquis/marquis.cpp
+++ b/noatun/modules/marquis/marquis.cpp
@@ -69,7 +69,7 @@ static void setPlayStatus( Player *player, int status )
Marquis::Marquis()
- : KMainWindow(0, "Marquis")
+ : TDEMainWindow(0, "Marquis")
, SessionManagement()
{
hide();
@@ -78,8 +78,8 @@ Marquis::Marquis()
// for testing: uncomment this and use
// dcop `dcop | grep noatun` Marquis activateAction dynamicRestore
// and dynamicSave accordingly.
-// (void) new KAction("Restore", 0, this, TQT_SLOT( dynamicRestore() ), actionCollection(), "dynamicRestore" );
-// (void) new KAction("Save", 0, this, TQT_SLOT( dynamicSave() ), actionCollection(), "dynamicSave" );
+// (void) new TDEAction("Restore", 0, this, TQT_SLOT( dynamicRestore() ), actionCollection(), "dynamicRestore" );
+// (void) new TDEAction("Save", 0, this, TQT_SLOT( dynamicSave() ), actionCollection(), "dynamicSave" );
connect( napp, TQT_SIGNAL( saveYourself() ), TQT_SLOT( dynamicSave() ));
}
diff --git a/noatun/modules/marquis/marquis.h b/noatun/modules/marquis/marquis.h
index d07ed297..276ebc9a 100644
--- a/noatun/modules/marquis/marquis.h
+++ b/noatun/modules/marquis/marquis.h
@@ -32,7 +32,7 @@
class Player;
-class Marquis : public KMainWindow, public SessionManagement
+class Marquis : public TDEMainWindow, public SessionManagement
{
Q_OBJECT
diff --git a/noatun/modules/metatag/metatag.cpp b/noatun/modules/metatag/metatag.cpp
index 5ffa1e6a..db71f715 100644
--- a/noatun/modules/metatag/metatag.cpp
+++ b/noatun/modules/metatag/metatag.cpp
@@ -32,7 +32,7 @@ extern "C"
MetaTagLoader::MetaTagLoader():Plugin()
{
- mAction = new KAction(i18n("&Tag Editor..."), "edit", 0, this, TQT_SLOT(editTag()), this, "edittag");
+ mAction = new TDEAction(i18n("&Tag Editor..."), "edit", 0, this, TQT_SLOT(editTag()), this, "edittag");
napp->pluginActionMenu()->insert(mAction);
}
diff --git a/noatun/modules/metatag/metatag.h b/noatun/modules/metatag/metatag.h
index af5ed015..43eb9f3c 100644
--- a/noatun/modules/metatag/metatag.h
+++ b/noatun/modules/metatag/metatag.h
@@ -9,7 +9,7 @@
#include <tqobject.h>
class KFileMetaInfo;
-class KAction;
+class TDEAction;
class MetaTagLoader:public TQObject, public Tags, public Plugin {
Q_OBJECT
@@ -25,7 +25,7 @@ class MetaTagLoader:public TQObject, public Tags, public Plugin {
private:
bool setProperty(KFileMetaInfo &info, PlaylistItem &item, const TQString &key, const TQString &property);
int menuID;
- KAction *mAction;
+ TDEAction *mAction;
};
#endif
diff --git a/noatun/modules/monoscope/monoscope.cpp b/noatun/modules/monoscope/monoscope.cpp
index dac87cf2..f7e35778 100644
--- a/noatun/modules/monoscope/monoscope.cpp
+++ b/noatun/modules/monoscope/monoscope.cpp
@@ -40,7 +40,7 @@ Monoscope::~Monoscope()
void Monoscope::init()
{
- mAction = new KToggleAction(i18n("Toggle Monoscope"), 0, 0,
+ mAction = new TDEToggleAction(i18n("Toggle Monoscope"), 0, 0,
TQT_TQOBJECT(this), TQT_SLOT(toggle()), TQT_TQOBJECT(this), "togglemonoscope");
mAction->setChecked(!isHidden());
napp->pluginActionMenu()->insert(mAction);
diff --git a/noatun/modules/monoscope/monoscope.h b/noatun/modules/monoscope/monoscope.h
index fbb61153..7fddb26b 100644
--- a/noatun/modules/monoscope/monoscope.h
+++ b/noatun/modules/monoscope/monoscope.h
@@ -3,7 +3,7 @@
#include <noatun/plugin.h>
-class KToggleAction;
+class TDEToggleAction;
class Monoscope : public TQWidget, public MonoScope, public Plugin
{
@@ -28,7 +28,7 @@ protected:
private:
TQRgb mHighColor, mLowColor;
- KToggleAction *mAction;
+ TDEToggleAction *mAction;
};
#endif
diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp
index 4cda6fe0..52552be8 100644
--- a/noatun/modules/simple/userinterface.cpp
+++ b/noatun/modules/simple/userinterface.cpp
@@ -50,7 +50,7 @@
#include "volume.xpm"
SimpleUI::SimpleUI()
- : KMainWindow(0, "NoatunSimpleUI"), UserInterface()
+ : TDEMainWindow(0, "NoatunSimpleUI"), UserInterface()
{
setAcceptDrops( true );
setCaption( i18n("Noatun") );
@@ -127,7 +127,7 @@ SimpleUI::~SimpleUI()
void SimpleUI::setupActions()
{
KStdAction::open( TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection(), "_file_open" );
- new KAction( i18n("&Properties"), 0, TQT_TQOBJECT(propertiesDialog), TQT_SLOT(show()),
+ new TDEAction( i18n("&Properties"), 0, TQT_TQOBJECT(propertiesDialog), TQT_SLOT(show()),
actionCollection(), "_file_properties" );
KStdAction::quit( TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection(), "_file_quit");
diff --git a/noatun/modules/simple/userinterface.h b/noatun/modules/simple/userinterface.h
index f32fae69..7265fa4e 100644
--- a/noatun/modules/simple/userinterface.h
+++ b/noatun/modules/simple/userinterface.h
@@ -25,7 +25,7 @@
#include "propertiesdialog.h"
-class SimpleUI : public KMainWindow, public UserInterface
+class SimpleUI : public TDEMainWindow, public UserInterface
{
Q_OBJECT
@@ -74,8 +74,8 @@ private:
L33tSlider *slider;
int extra_width;
int extra_height;
- KToggleAction *menubarAction;
- KToggleAction *statusbarAction;
+ TDEToggleAction *menubarAction;
+ TDEToggleAction *statusbarAction;
};
#endif
diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp
index cce64897..8e150cc1 100644
--- a/noatun/modules/splitplaylist/view.cpp
+++ b/noatun/modules/splitplaylist/view.cpp
@@ -49,7 +49,7 @@ SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, co
addRef();
setUrl(text);
- static_cast<KListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after);
+ static_cast<TDEListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after);
setOn(true);
// is this really needed, it makes the listview too wide for me :(
@@ -91,7 +91,7 @@ SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, co
}
}
- static_cast<KListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after);
+ static_cast<TDEListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after);
modified();
if (!streamable() && enqueue(url()))
@@ -345,7 +345,7 @@ void SafeListViewItem::remove()
}
List::List(View *parent)
- : KListView(parent), recursiveAddAfter(0), listJob(0)
+ : TDEListView(parent), recursiveAddAfter(0), listJob(0)
{
addColumn(i18n("File"));
addColumn(i18n("Time"));
@@ -372,7 +372,7 @@ void List::move()
bool List::acceptDrag(TQDropEvent *event) const
{
- return KURLDrag::canDecode(event) || KListView::acceptDrag(event);
+ return KURLDrag::canDecode(event) || TDEListView::acceptDrag(event);
}
void List::dropEvent(TQDropEvent *event, TQListViewItem *after)
@@ -396,7 +396,7 @@ void List::keyPressEvent(TQKeyEvent *e)
{
if (currentItem())
{
- emit KListView::executed(currentItem());
+ emit TDEListView::executed(currentItem());
}
return;
@@ -412,7 +412,7 @@ void List::keyPressEvent(TQKeyEvent *e)
return;
}
- KListView::keyPressEvent(e);
+ TDEListView::keyPressEvent(e);
}
@@ -634,7 +634,7 @@ void List::slotRedirection(TDEIO::Job *, const KURL & url)
/////////////////////////////////
View::View(SplitPlaylist *)
- : KMainWindow(0, "NoatunSplitplaylistView")
+ : TDEMainWindow(0, "NoatunSplitplaylistView")
{
list=new List(this);
setCentralWidget(list);
@@ -642,9 +642,9 @@ View::View(SplitPlaylist *)
// connect the click on the header with sorting
connect(list->header(),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(headerClicked(int)) );
- mOpen=new KAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files");
- (void) new KAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()), actionCollection(), "add_dir");
- mDelete=new KAction(i18n("Delete"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(deleteSelected()), actionCollection(), "delete");
+ mOpen=new TDEAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files");
+ (void) new TDEAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()), actionCollection(), "add_dir");
+ mDelete=new TDEAction(i18n("Delete"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(deleteSelected()), actionCollection(), "delete");
mClose=KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
mFind=KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(find()), actionCollection());
@@ -655,8 +655,8 @@ View::View(SplitPlaylist *)
mSave=KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection());
mSaveAs=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection());
- (void) new KAction(i18n("Shuffle"), "misc", 0, TQT_TQOBJECT(SPL), TQT_SLOT( randomize() ), actionCollection(), "shuffle");
- (void) new KAction(i18n("Clear"), "editclear", 0, TQT_TQOBJECT(list), TQT_SLOT( clear() ), actionCollection(), "clear");
+ (void) new TDEAction(i18n("Shuffle"), "misc", 0, TQT_TQOBJECT(SPL), TQT_SLOT( randomize() ), actionCollection(), "shuffle");
+ (void) new TDEAction(i18n("Clear"), "editclear", 0, TQT_TQOBJECT(list), TQT_SLOT( clear() ), actionCollection(), "clear");
createGUI("splui.rc");
diff --git a/noatun/modules/splitplaylist/view.h b/noatun/modules/splitplaylist/view.h
index 48a0be67..9bff4335 100644
--- a/noatun/modules/splitplaylist/view.h
+++ b/noatun/modules/splitplaylist/view.h
@@ -55,7 +55,7 @@ private:
bool removed;
};
-class List : public KListView
+class List : public TDEListView
{
Q_OBJECT
@@ -100,10 +100,10 @@ protected:
};
class KFileDialog;
-class KToggleAction;
-class KToolBar;
+class TDEToggleAction;
+class TDEToolBar;
-class View : public KMainWindow
+class View : public TDEMainWindow
{
Q_OBJECT
@@ -155,9 +155,9 @@ signals:
private:
List *list;
- KAction *mOpen, *mDelete, *mSave, *mSaveAs, *mOpenpl, *mOpenNew;
- KAction *mClose;
- KAction *mFind;
+ TDEAction *mOpen, *mDelete, *mSave, *mSaveAs, *mOpenpl, *mOpenNew;
+ TDEAction *mClose;
+ TDEAction *mFind;
Finder *mFinder;
KURL mPlaylistFile;
diff --git a/noatun/modules/systray/kitsystemtray.cpp b/noatun/modules/systray/kitsystemtray.cpp
index a0b545ab..63a467b6 100644
--- a/noatun/modules/systray/kitsystemtray.cpp
+++ b/noatun/modules/systray/kitsystemtray.cpp
@@ -44,11 +44,11 @@
#include <fixx11h.h>
-KitSystemTray::KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name)
+KitSystemTray::KitSystemTray(const TQString &contextMenu, TDEMainWindow *parent, const char *name)
: KSystemTray(parent, name)
{
setAlignment(AlignHCenter | AlignVCenter);
- menu = (KPopupMenu *)parent->guiFactory()->container(contextMenu, parent);
+ menu = (TDEPopupMenu *)parent->guiFactory()->container(contextMenu, parent);
menu->insertTitle(SmallIcon("noatun"), TQString(), 0, 0);
setAcceptDrops(true);
}
diff --git a/noatun/modules/systray/kitsystemtray.h b/noatun/modules/systray/kitsystemtray.h
index d012853e..13a8b518 100644
--- a/noatun/modules/systray/kitsystemtray.h
+++ b/noatun/modules/systray/kitsystemtray.h
@@ -30,8 +30,8 @@
#include <ksystemtray.h>
-class KPopupMenu;
-class KMainWindow;
+class TDEPopupMenu;
+class TDEMainWindow;
class TQPixmap;
class KitSystemTray : public KSystemTray
@@ -40,7 +40,7 @@ Q_OBJECT
public:
- KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name = 0);
+ KitSystemTray(const TQString &contextMenu, TDEMainWindow *parent, const char *name = 0);
void changeTitle(const TQPixmap &, const TQString &);
protected:
virtual void showEvent(TQShowEvent *);
@@ -49,7 +49,7 @@ protected:
virtual void dropEvent(TQDropEvent *);
virtual void wheelEvent(TQWheelEvent *e);
- KPopupMenu *menu;
+ TDEPopupMenu *menu;
};
#endif
diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp
index 27976429..0cfde28e 100644
--- a/noatun/modules/systray/systray.cpp
+++ b/noatun/modules/systray/systray.cpp
@@ -90,7 +90,7 @@ protected:
//NoatunSystray *NoatunSystray::self = 0;
-NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(),
+NoatunSystray::NoatunSystray() : TDEMainWindow(0, "NoatunSystray"), Plugin(),
mTray(0), trayStatus(0), trayBase(0), mPassivePopup(0L)
{
//self = this;
diff --git a/noatun/modules/systray/systray.h b/noatun/modules/systray/systray.h
index 270bef01..b1dd7aad 100644
--- a/noatun/modules/systray/systray.h
+++ b/noatun/modules/systray/systray.h
@@ -38,7 +38,7 @@ class KitSystemTray;
class TQTimer;
class PassivePopup;
-class NoatunSystray : public KMainWindow, public Plugin
+class NoatunSystray : public TDEMainWindow, public Plugin
{
Q_OBJECT
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 07:45:52 +0000