summaryrefslogtreecommitdiffstats
path: root/kaboodle
diff options
context:
space:
mode:
Diffstat (limited to 'kaboodle')
-rw-r--r--kaboodle/controls.cpp4
-rw-r--r--kaboodle/engine.cpp2
-rw-r--r--kaboodle/kaboodle_factory.h2
-rw-r--r--kaboodle/player.cpp16
-rw-r--r--kaboodle/userinterface.cpp18
-rw-r--r--kaboodle/view.cpp28
6 files changed, 35 insertions, 35 deletions
diff --git a/kaboodle/controls.cpp b/kaboodle/controls.cpp
index 5ac7d3b0..74517bd4 100644
--- a/kaboodle/controls.cpp
+++ b/kaboodle/controls.cpp
@@ -97,11 +97,11 @@ int Kaboodle::SliderAction::plug( TQWidget *w, int index )
addContainer( toolBar, id );
- connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+ connect( toolBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
toolBar->setItemAutoSized( id, true );
if (w->inherits( "TDEToolBar" ))
- connect(toolBar, TQT_SIGNAL(moved(TDEToolBar::BarPosition)), this, TQT_SLOT(toolbarMoved(TDEToolBar::BarPosition)));
+ connect(toolBar, TQ_SIGNAL(moved(TDEToolBar::BarPosition)), this, TQ_SLOT(toolbarMoved(TDEToolBar::BarPosition)));
emit plugged();
diff --git a/kaboodle/engine.cpp b/kaboodle/engine.cpp
index 9008dab0..44b62dd1 100644
--- a/kaboodle/engine.cpp
+++ b/kaboodle/engine.cpp
@@ -31,7 +31,7 @@ extern "C"
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <kmimetype.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurl.h>
#include <tqtimer.h>
#include <tqfile.h>
diff --git a/kaboodle/kaboodle_factory.h b/kaboodle/kaboodle_factory.h
index 917429b7..4d14300d 100644
--- a/kaboodle/kaboodle_factory.h
+++ b/kaboodle/kaboodle_factory.h
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define KABOODLE_FACTORY_H
#include <tdeaboutdata.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdeparts/factory.h>
namespace Kaboodle
diff --git a/kaboodle/player.cpp b/kaboodle/player.cpp
index 4ec345c7..776ff320 100644
--- a/kaboodle/player.cpp
+++ b/kaboodle/player.cpp
@@ -41,7 +41,7 @@ Kaboodle::Player::Player(TQObject *parent, const char *name)
{
setInstance(KaboodleFactory::instance());
- connect(&ticker, TQT_SIGNAL(timeout()), TQT_SLOT(tickerTimeout()));
+ connect(&ticker, TQ_SIGNAL(timeout()), TQ_SLOT(tickerTimeout()));
ticker.start(500);
setState(Empty);
}
@@ -56,18 +56,18 @@ Kaboodle::Player::Player(TQWidget *widgetParent, const char *widgetName,
{
setInstance(KaboodleFactory::instance());
- connect(&ticker, TQT_SIGNAL(timeout()), TQT_SLOT(tickerTimeout()));
+ connect(&ticker, TQ_SIGNAL(timeout()), TQ_SLOT(tickerTimeout()));
ticker.start(500);
setState(Empty);
- playAction = new TDEAction(i18n("&Play"), 0, this, TQT_SLOT(play()), actionCollection(), "play");
- pauseAction = new TDEAction(i18n("&Pause"), 0, this, TQT_SLOT(pause()), actionCollection(), "pause");
- stopAction = new TDEAction(i18n("&Stop"), 0, this, TQT_SLOT(stop()), actionCollection(), "stop");
- loopAction = new TDEToggleAction(i18n("&Looping"), 0, this, TQT_SLOT(loop()), actionCollection(), "loop");
+ playAction = new TDEAction(i18n("&Play"), 0, this, TQ_SLOT(play()), actionCollection(), "play");
+ pauseAction = new TDEAction(i18n("&Pause"), 0, this, TQ_SLOT(pause()), actionCollection(), "pause");
+ stopAction = new TDEAction(i18n("&Stop"), 0, this, TQ_SLOT(stop()), actionCollection(), "stop");
+ loopAction = new TDEToggleAction(i18n("&Looping"), 0, this, TQ_SLOT(loop()), actionCollection(), "loop");
stopAction->setEnabled(false);
playAction->setEnabled(false);
pauseAction->setEnabled(false);
- connect(this, TQT_SIGNAL(loopingChanged(bool)), loopAction, TQT_SLOT(setChecked(bool)));
+ connect(this, TQ_SIGNAL(loopingChanged(bool)), loopAction, TQ_SLOT(setChecked(bool)));
KParts::Part::setWidget(widget);
setXMLFile("kaboodlepartui.rc");
@@ -108,7 +108,7 @@ bool Kaboodle::Player::openURL(const KURL &f)
if (previousLoad)
{
- TQTimer::singleShot( 0, this, SLOT(play()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(play()) );
return true;
}
diff --git a/kaboodle/userinterface.cpp b/kaboodle/userinterface.cpp
index 08531166..d9d2c3f4 100644
--- a/kaboodle/userinterface.cpp
+++ b/kaboodle/userinterface.cpp
@@ -54,16 +54,16 @@ Kaboodle::UserInterface::UserInterface(TQWidget *parent, const KURL &initialFile
setAcceptDrops(true);
setStandardToolBarMenuEnabled(true);
- KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
- KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
- KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(playerPreferences()), actionCollection());
- KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeys() ), actionCollection() );
+ KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
+ KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
+ KStdAction::preferences(this, TQ_SLOT(playerPreferences()), actionCollection());
+ KStdAction::keyBindings( this, TQ_SLOT( slotConfigureKeys() ), actionCollection() );
- menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()), actionCollection());
- propertiesAction = new TDEAction(i18n("Properties"), 0, TQT_TQOBJECT(this), TQT_SLOT(properties()), actionCollection(), "properties");
+ menubarAction = KStdAction::showMenubar(this, TQ_SLOT(showMenubar()), actionCollection());
+ propertiesAction = new TDEAction(i18n("Properties"), 0, this, TQ_SLOT(properties()), actionCollection(), "properties");
propertiesAction->setEnabled(false);
- part = new Player(this, "KaboodlePlayer", TQT_TQOBJECT(this), "KaboodleView");
+ part = new Player(this, "KaboodlePlayer", this, "KaboodleView");
part->view()->setButtons(KMediaPlayer::View::Seeker);
setCentralWidget(part->view());
@@ -72,8 +72,8 @@ Kaboodle::UserInterface::UserInterface(TQWidget *parent, const KURL &initialFile
statusBar()->show();
- connect(part, TQT_SIGNAL(setWindowCaption(const TQString &)), this, TQT_SLOT(updateTitle(const TQString &)));
- connect(part->view(), TQT_SIGNAL(adaptSize(int, int)), this, TQT_SLOT(adaptSize(int, int)));
+ connect(part, TQ_SIGNAL(setWindowCaption(const TQString &)), this, TQ_SLOT(updateTitle(const TQString &)));
+ connect(part->view(), TQ_SIGNAL(adaptSize(int, int)), this, TQ_SLOT(adaptSize(int, int)));
setIcon(SmallIcon("kaboodle"));
diff --git a/kaboodle/view.cpp b/kaboodle/view.cpp
index ef9e1fcb..ccb36cfa 100644
--- a/kaboodle/view.cpp
+++ b/kaboodle/view.cpp
@@ -49,7 +49,7 @@ TQButton *createButton(const TQIconSet &_iconset, const TQString &_tip, TQObject
button->setMaximumSize(50, 50);
button->setIconSet(_iconset);
TQToolTip::add(button, _tip);
- TQObject::connect(button, TQT_SIGNAL(clicked()), _receiver, _slot);
+ TQObject::connect(button, TQ_SIGNAL(clicked()), _receiver, _slot);
button->show();
return button;
}
@@ -72,9 +72,9 @@ Kaboodle::View::View(TQWidget *parent, const char *name, Player *p)
video = new KVideoWidget(player, box);
video->actionCollection()->readShortcutSettings();
setVideoWidget(video);
- connect(video, TQT_SIGNAL(adaptSize(int, int)), this, TQT_SLOT(calculateSize(int, int)));
- connect(video, TQT_SIGNAL(mouseButtonPressed(int, const TQPoint&, int)), this, TQT_SLOT(slotButtonPressed(int, const TQPoint &, int) ) ) ;
- connect(video, TQT_SIGNAL(mouseButtonDoubleClick(const TQPoint&, int)), this, TQT_SLOT(slotDblClick(const TQPoint &, int) ) ) ;
+ connect(video, TQ_SIGNAL(adaptSize(int, int)), this, TQ_SLOT(calculateSize(int, int)));
+ connect(video, TQ_SIGNAL(mouseButtonPressed(int, const TQPoint&, int)), this, TQ_SLOT(slotButtonPressed(int, const TQPoint &, int) ) ) ;
+ connect(video, TQ_SIGNAL(mouseButtonDoubleClick(const TQPoint&, int)), this, TQ_SLOT(slotDblClick(const TQPoint &, int) ) ) ;
TQWidget *sliderBox = new TQWidget(box);
sliderBox->setFocusPolicy(TQWidget::ClickFocus);
@@ -85,9 +85,9 @@ Kaboodle::View::View(TQWidget *parent, const char *name, Player *p)
layout->setMargin(0);
layout->setAutoAdd(true);
- playButton = createButton(BarIconSet("1rightarrow"), i18n("Play"), player, TQT_SLOT(play()), sliderBox);
- pauseButton = createButton(BarIconSet("media-playback-pause"), i18n("Pause"), player, TQT_SLOT(pause()), sliderBox);
- stopButton = createButton(BarIconSet("media-playback-stop"), i18n("Stop"), player, TQT_SLOT(stop()), sliderBox);
+ playButton = createButton(BarIconSet("1rightarrow"), i18n("Play"), player, TQ_SLOT(play()), sliderBox);
+ pauseButton = createButton(BarIconSet("media-playback-pause"), i18n("Pause"), player, TQ_SLOT(pause()), sliderBox);
+ stopButton = createButton(BarIconSet("media-playback-stop"), i18n("Stop"), player, TQ_SLOT(stop()), sliderBox);
slider = new L33tSlider(0, 1000, 10, 0, TQt::Horizontal, sliderBox);
slider->setTickmarks(TQSlider::NoMarks);
@@ -103,15 +103,15 @@ Kaboodle::View::View(TQWidget *parent, const char *name, Player *p)
elapsedLabel->setFixedHeight(labelFontMetrics.height());
elapsedLabel->setMinimumWidth(labelFontMetrics.width("00:00"));
- connect(player, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(stateChanged(int)));
- connect(player, TQT_SIGNAL(completed()), this, TQT_SLOT(playerFinished()));
- connect(player, TQT_SIGNAL(timeout()), this, TQT_SLOT(playerTimeout()));
+ connect(player, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(stateChanged(int)));
+ connect(player, TQ_SIGNAL(completed()), this, TQ_SLOT(playerFinished()));
+ connect(player, TQ_SIGNAL(timeout()), this, TQ_SLOT(playerTimeout()));
- connect(slider, TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int)));
- connect(slider, TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(sliderMoved(int)));
+ connect(slider, TQ_SIGNAL(userChanged(int)), this, TQ_SLOT(skipToWrapper(int)));
+ connect(slider, TQ_SIGNAL(sliderMoved(int)), this, TQ_SLOT(sliderMoved(int)));
slider->setEnabled(false);
- connect(this, TQT_SIGNAL(buttonsChanged(int)), this, TQT_SLOT(updateButtons(int)));
+ connect(this, TQ_SIGNAL(buttonsChanged(int)), this, TQ_SLOT(updateButtons(int)));
updateButtons(buttons());
updateLabel("--:--/--:--");
@@ -174,7 +174,7 @@ void Kaboodle::View::stateChanged(int s)
void Kaboodle::View::playerFinished()
{
- if(quitAfterPlaying) kapp->quit();
+ if(quitAfterPlaying) tdeApp->quit();
}
void Kaboodle::View::playerTimeout()
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-26 03:55:37 +0000