diff options
Diffstat (limited to 'kaboodle')
-rw-r--r-- | kaboodle/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kaboodle/conf.h | 2 | ||||
-rw-r--r-- | kaboodle/controls.cpp | 12 | ||||
-rw-r--r-- | kaboodle/controls.h | 8 | ||||
-rw-r--r-- | kaboodle/engine.cpp | 2 | ||||
-rw-r--r-- | kaboodle/engine.h | 2 | ||||
-rw-r--r-- | kaboodle/kaboodle_factory.h | 6 | ||||
-rw-r--r-- | kaboodle/kaboodleapp.h | 2 | ||||
-rw-r--r-- | kaboodle/main.cpp | 2 | ||||
-rw-r--r-- | kaboodle/player.cpp | 16 | ||||
-rw-r--r-- | kaboodle/player.h | 4 | ||||
-rw-r--r-- | kaboodle/userinterface.cpp | 18 | ||||
-rw-r--r-- | kaboodle/userinterface.h | 2 | ||||
-rw-r--r-- | kaboodle/view.cpp | 32 | ||||
-rw-r--r-- | kaboodle/view.h | 2 |
15 files changed, 56 insertions, 56 deletions
diff --git a/kaboodle/CMakeLists.txt b/kaboodle/CMakeLists.txt index 85cb017b..15680177 100644 --- a/kaboodle/CMakeLists.txt +++ b/kaboodle/CMakeLists.txt @@ -53,7 +53,7 @@ tde_add_kpart( libkaboodlepart AUTOMOC DESTINATION ${PLUGIN_INSTALL_DIR} ) -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp "" ) +configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY ) ##### kaboodle (executable) ##################### diff --git a/kaboodle/conf.h b/kaboodle/conf.h index 06699db0..59c0d3bd 100644 --- a/kaboodle/conf.h +++ b/kaboodle/conf.h @@ -35,7 +35,7 @@ namespace Kaboodle class Conf : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kaboodle/controls.cpp b/kaboodle/controls.cpp index c6b0a4a8..74517bd4 100644 --- a/kaboodle/controls.cpp +++ b/kaboodle/controls.cpp @@ -26,11 +26,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Kaboodle::L33tSlider::L33tSlider(TQWidget * parent, const char * name) : TQSlider(parent,name), pressed(false) {} -Kaboodle::L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * parent, const char * name) : +Kaboodle::L33tSlider::L33tSlider(TQt::Orientation o, TQWidget * parent, const char * name) : TQSlider(o,parent,name), pressed(false) {} Kaboodle::L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value, - Qt::Orientation o, TQWidget * parent, const char * name) : + TQt::Orientation o, TQWidget * parent, const char * name) : TQSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false) {} @@ -47,7 +47,7 @@ void Kaboodle::L33tSlider::setValue(int i) void Kaboodle::L33tSlider::mousePressEvent(TQMouseEvent*e) { - if (e->button()!=Qt::RightButton) + if (e->button()!=TQt::RightButton) { pressed=true; TQSlider::mousePressEvent(e); @@ -91,17 +91,17 @@ int Kaboodle::SliderAction::plug( TQWidget *w, int index ) int id = TDEAction::getToolButtonID(); //Create it. - m_slider=new L33tSlider(0, 1000, 100, 0,Qt::Horizontal, toolBar); + m_slider=new L33tSlider(0, 1000, 100, 0,TQt::Horizontal, toolBar); m_slider->setMinimumWidth(10); toolBar->insertWidget(id, 10, m_slider, 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/controls.h b/kaboodle/controls.h index 307281e4..36bf4cb4 100644 --- a/kaboodle/controls.h +++ b/kaboodle/controls.h @@ -42,13 +42,13 @@ namespace Kaboodle **/ class L33tSlider : public TQSlider { -Q_OBJECT +TQ_OBJECT public: L33tSlider(TQWidget * parent, const char * name=0); - L33tSlider(Qt::Orientation, TQWidget * parent, const char * name=0); + L33tSlider(TQt::Orientation, TQWidget * parent, const char * name=0); L33tSlider(int minValue, int maxValue, int pageStep, int value, - Qt::Orientation, TQWidget * parent, const char * name=0); + TQt::Orientation, TQWidget * parent, const char * name=0); bool currentlyPressed() const; signals: @@ -73,7 +73,7 @@ private: **/ class SliderAction : public TDEAction { -Q_OBJECT +TQ_OBJECT public: SliderAction(const TQString& text, int accel, const TQObject *receiver, 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/engine.h b/kaboodle/engine.h index 974a8541..ccd5c6ba 100644 --- a/kaboodle/engine.h +++ b/kaboodle/engine.h @@ -44,7 +44,7 @@ namespace Kaboodle **/ class Engine : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/kaboodle/kaboodle_factory.h b/kaboodle/kaboodle_factory.h index f1a3f72e..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 @@ -34,14 +34,14 @@ class Player; class KaboodleFactory : public KParts::Factory { -Q_OBJECT +TQ_OBJECT public: KaboodleFactory(); virtual ~KaboodleFactory(); - virtual KParts::Part *createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); + virtual KParts::Part *createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *parent = 0, const char *name = 0, const char *classname = "TQObject", const TQStringList &args = TQStringList()); static const TDEAboutData *aboutData(); static TDEInstance *instance(); diff --git a/kaboodle/kaboodleapp.h b/kaboodle/kaboodleapp.h index c248b91f..1872d72a 100644 --- a/kaboodle/kaboodleapp.h +++ b/kaboodle/kaboodleapp.h @@ -32,7 +32,7 @@ class UserInterface; class KaboodleApp : public TDEApplication { -Q_OBJECT +TQ_OBJECT public: diff --git a/kaboodle/main.cpp b/kaboodle/main.cpp index d83fb8cf..154b1b25 100644 --- a/kaboodle/main.cpp +++ b/kaboodle/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char **argv) #ifndef NDEBUG if(!TDECmdLineArgs::parsedArgs()->isSet("qdebug")) - tqInstallMsgHandler(noMessageOutput); + qInstallMsgHandler(noMessageOutput); #endif Kaboodle::KaboodleApp::addCmdLineOptions(); 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/player.h b/kaboodle/player.h index b528fa9d..f9379c56 100644 --- a/kaboodle/player.h +++ b/kaboodle/player.h @@ -42,7 +42,7 @@ class View; class BrowserExtension : public KParts::BrowserExtension { -Q_OBJECT +TQ_OBJECT public: @@ -51,7 +51,7 @@ public: class Player : public KMediaPlayer::Player { -Q_OBJECT +TQ_OBJECT public: 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/userinterface.h b/kaboodle/userinterface.h index d82186a4..816941e7 100644 --- a/kaboodle/userinterface.h +++ b/kaboodle/userinterface.h @@ -41,7 +41,7 @@ namespace Kaboodle */ class UserInterface : public KParts::MainWindow { -Q_OBJECT +TQ_OBJECT public: UserInterface(TQWidget *parent, const KURL &initialFile = KURL()); diff --git a/kaboodle/view.cpp b/kaboodle/view.cpp index 7cf14afc..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,12 +72,12 @@ 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(TQ_ClickFocus); + sliderBox->setFocusPolicy(TQWidget::ClickFocus); sliderBox->setAcceptDrops(true); TQHBoxLayout *layout = new TQHBoxLayout(sliderBox); @@ -85,11 +85,11 @@ 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, Qt::Horizontal, sliderBox); + slider = new L33tSlider(0, 1000, 10, 0, TQt::Horizontal, sliderBox); slider->setTickmarks(TQSlider::NoMarks); slider->show(); @@ -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() diff --git a/kaboodle/view.h b/kaboodle/view.h index 9b4e8fba..c5003980 100644 --- a/kaboodle/view.h +++ b/kaboodle/view.h @@ -44,7 +44,7 @@ namespace Kaboodle { class View : public KMediaPlayer::View { -Q_OBJECT +TQ_OBJECT public: |