diff options
489 files changed, 4302 insertions, 3416 deletions
diff --git a/CMakeL10n.txt b/CMakeL10n.txt index 8ea5d4df..846a8586 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,7 +9,11 @@ # ################################################# -cmake_minimum_required( VERSION 3.5 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) ##### include our cmake modules ################# diff --git a/CMakeLists.txt b/CMakeLists.txt index 76f61281..6e27d43a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,21 +9,24 @@ # ################################################# -cmake_minimum_required( VERSION 3.5 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) ##### general package setup ##################### project( tdemultimedia ) - set( PACKAGE tdemultimedia ) -enable_testing( ) - ##### include essential cmake modules ########### include( FindPkgConfig ) +include( FindThreads ) include( CheckIncludeFile ) include( CheckIncludeFileCXX ) include( CheckTypeSize ) @@ -32,6 +35,8 @@ include( CheckCXXSourceCompiles ) include( CheckFunctionExists ) include( CheckLibraryExists ) include( CheckSymbolExists ) +enable_language( ASM ) +enable_testing( ) ##### include our cmake modules ################# @@ -39,11 +44,6 @@ include( CheckSymbolExists ) include( TDEMacros ) -##### set version number ######################## - -tde_set_project_version( ) - - ##### setup install paths ####################### include( TDESetupPaths ) @@ -52,7 +52,7 @@ tde_setup_paths( ) ##### optional stuff ############################ -OPTION( WITH_ALL_OPTIONS "Enable all optional support" OFF ) +option( WITH_ALL_OPTIONS "Enable all optional support" OFF ) option( WITH_ALSA "Enable ALSA support (kscd, kmix)" ON ) option( WITH_ARTS_AKODE "Enable aRts akode plugin" ${WITH_ALL_OPTIONS} ) option( WITH_ARTS_AUDIOFILE "Enable aRts audiofile plugin" ${WITH_ALL_OPTIONS} ) @@ -167,14 +167,8 @@ configure_file( config.h.cmake config.h @ONLY ) ##### add apidox targets ############ -if( "${CMAKE_VERSION}" VERSION_LESS "3.1" ) - set( CMAKE_ENV "env" ) -else() - set( CMAKE_ENV "${CMAKE_COMMAND};-E;env" ) -endif() - add_custom_target( apidox - COMMAND ${CMAKE_ENV} + COMMAND ${CMAKE_COMMAND} -E env "TQTDOCDIR=/usr/share/tqt3/doc/html" "DOXDATA=${HTML_INSTALL_DIR}/en/common" ${CMAKE_SOURCE_DIR}/admin/doxygen.sh diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 16381307..76156fec 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -15,52 +15,28 @@ test_big_endian(WORDS_BIGENDIAN) tde_setup_largefiles( ) -if( NOT CMAKE_ARCHITECTURE ) - execute_process( - COMMAND ${CMAKE_C_COMPILER} -dumpmachine - OUTPUT_VARIABLE CMAKE_ARCHITECTURE - ERROR_VARIABLE CMAKE_ARCHITECTURE - OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_STRIP_TRAILING_WHITESPACE ) - set( CMAKE_ARCHITECTURE "${CMAKE_ARCHITECTURE}" CACHE INTERNAL "" FORCE ) - message( STATUS "Detected ${CMAKE_ARCHITECTURE} target architecture" ) -endif( NOT CMAKE_ARCHITECTURE ) - -if( ${CMAKE_ARCHITECTURE} MATCHES "i.86" ) - if( NOT ASM_COMPILER_VERSION ) - message( STATUS "Checking binutils version" ) - execute_process( - COMMAND echo - COMMAND as -v - OUTPUT_VARIABLE ASM_VERSION - ERROR_VARIABLE ASM_VERSION - ) - string(REGEX REPLACE ".*version ([0-9][^ \n]*).*" "\\1" ASM_COMPILER_VERSION ${ASM_VERSION} ) - set( ASM_COMPILER_VERSION "${ASM_COMPILER_VERSION}" CACHE INTERNAL "" FORCE ) - message( STATUS "Checking binutils version - ${ASM_COMPILER_VERSION}" ) - endif( NOT ASM_COMPILER_VERSION ) - - if( NOT MMX_SUPPORT ) - message( STATUS "Performing test MMX_SUPPORT" ) - if( ${ASM_COMPILER_VERSION} VERSION_LESS "2.10" ) - message( STATUS "Performing test MMX_SUPPORT - Failed" ) - else( ) - message( STATUS "Performing test MMX_SUPPORT - Success" ) - set( MMX_SUPPORT 1 CACHE INTERNAL "" FORCE ) - endif( ) - endif( NOT MMX_SUPPORT ) - - check_c_source_compiles( " - int main() { - #if defined(__GNUC__) && defined(__i386__) - __asm__(\"movups %xmm0, (%esp)\"); - #else - #error Not gcc on x86 - #endif - return 0; }" - HAVE_X86_SSE - ) -endif( ${CMAKE_ARCHITECTURE} MATCHES "i.86" ) + +##### check specific architecture dependant support + +if( CMAKE_SYSTEM_PROCESSOR MATCHES "i.86" ) + + # MMX support + message( STATUS "Performing MMX support test" ) + cmake_host_system_information( RESULT HAVE_X86_MMX QUERY HAS_MMX ) + if( HAVE_X86_MMX ) + message( STATUS "Performing MMX support test - Success" ) + set( CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -DHAVE_X86_MMX" ) + endif( ) + + # SSE support + message( STATUS "Performing SSE support test" ) + cmake_host_system_information( RESULT HAVE_X86_SSE QUERY HAS_SSE ) + if( HAVE_X86_SSE ) + message( STATUS "Performing SSE support test - Success" ) + set( CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -DHAVE_X86_SSE" ) + endif( ) + +endif( ) message( STATUS "Cheking system type - ${CMAKE_SYSTEM_NAME}" ) if( ${CMAKE_SYSTEM_NAME} MATCHES "AIX" ) @@ -97,19 +73,6 @@ check_include_file( sys/soundcard.h HAVE_SYS_SOUNDCARD_H ) check_include_file( machine/soundcard.h HAVE_MACHINE_SOUNDCARD_H ) -##### check libraries ########################### - -set( DL_LIBRARIES dl ) -check_library_exists( ${DL_LIBRARIES} dlopen /lib HAVE_LIBDL ) -if( NOT HAVE_LIBDL ) - unset( DL_LIBRARIES ) - check_function_exists( dlopen HAVE_DLOPEN ) - if( HAVE_DLOPEN ) - set( HAVE_LIBDL 1 ) - endif( HAVE_DLOPEN ) -endif( NOT HAVE_LIBDL ) - - # ALSA if( WITH_ALSA ) pkg_check_modules( ALSA alsa>=0.5 ) diff --git a/admin b/admin -Subproject 3bdc9fd55ff86f033cc1ffab9178d8453fa1ab2 +Subproject 4185112a621d8c5bc88984b117f434c9560e2cc diff --git a/arts/builder/CMakeLists.txt b/arts/builder/CMakeLists.txt index a8611e27..62e2c0c3 100644 --- a/arts/builder/CMakeLists.txt +++ b/arts/builder/CMakeLists.txt @@ -39,7 +39,7 @@ tde_add_executable( artsbuilder AUTOMOC execdlg.cpp qttableview.cpp interfacedlg.cpp LINK tdecore-shared tdeui-shared tdeio-shared artsbuilder-shared artskde-shared - mcop qtmcop artsflow_idl soundserver_idl pthread + mcop qtmcop artsflow_idl soundserver_idl ${CMAKE_THREAD_LIBS_INIT} DEPENDENCIES arts_builder_headers DESTINATION ${BIN_INSTALL_DIR} diff --git a/arts/builder/TODO b/arts/builder/TODO index 8b962aa5..139f22b2 100644 --- a/arts/builder/TODO +++ b/arts/builder/TODO @@ -41,7 +41,7 @@ Wishlist for the artsbuilder app: this should be very useful in editing objects with lots of properties (widgets) -- make _changed Q_SIGNALS visible so you can connect the value_changed of a +- make _changed signals visible so you can connect the value_changed of a poti to the frequency of a filter - make it possible to edit parent property of widgets (i.e. to insert one diff --git a/arts/builder/dirmanager.cpp b/arts/builder/dirmanager.cpp index f3907142..f83ab7d3 100644 --- a/arts/builder/dirmanager.cpp +++ b/arts/builder/dirmanager.cpp @@ -25,7 +25,7 @@ #include <tqfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdeapplication.h> #include <tdelocale.h> diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp index fcdce6b8..9b673f38 100644 --- a/arts/builder/execdlg.cpp +++ b/arts/builder/execdlg.cpp @@ -47,7 +47,7 @@ static void min_size(TQWidget *w) { ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure) :TQDialog(parent,"X") -/*, TRUE)*/ +/*, true)*/ { this->structure = structure; @@ -71,10 +71,10 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure) cpuusagelabel->setText(i18n("CPU usage: unknown")); cpuusagetimer = new TQTimer( this ); - connect( cpuusagetimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(updateCpuUsage()) ); - connect( cpuusagetimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(guiServerTick()) ); + connect( cpuusagetimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updateCpuUsage()) ); + connect( cpuusagetimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(guiServerTick()) ); cpuusagetimer->start( 2000, false ); min_size(cpuusagelabel); @@ -115,15 +115,15 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure) buttonlayout->addSpacing(5); KButtonBox *bbox = new KButtonBox(this); - bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() )); + bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() )); bbox->addStretch(1); TQButton *savebutton = bbox->addButton(KStdGuiItem::saveAs()); - connect( savebutton, TQT_SIGNAL( clicked() ), TQT_SLOT(saveSession() ) ); + connect( savebutton, TQ_SIGNAL( clicked() ), TQ_SLOT(saveSession() ) ); TQButton *okbutton = bbox->addButton(KStdGuiItem::ok()); - connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) ); + connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) ); bbox->layout(); //min_size(bbox); @@ -196,6 +196,6 @@ void ExecDlg::saveSession() void ExecDlg::help() { - TDEApplication::kApplication()->invokeHelp("", "karts"); + tdeApp->invokeHelp("", "karts"); } #include "execdlg.moc" diff --git a/arts/builder/interfacedlg.cpp b/arts/builder/interfacedlg.cpp index 99b8072e..cb090644 100644 --- a/arts/builder/interfacedlg.cpp +++ b/arts/builder/interfacedlg.cpp @@ -41,7 +41,7 @@ using namespace std; -InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE) +InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", true) { setCaption(i18n("aRts: Structureport View")); @@ -94,8 +94,8 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE) listbox->setMinimumSize(340,400); mainlayout->addWidget(listbox); - connect( listbox, TQT_SIGNAL( doubleClicked ( TQListBoxItem *)), this, - TQT_SLOT(accept())); + connect( listbox, TQ_SIGNAL( doubleClicked ( TQListBoxItem *)), this, + TQ_SLOT(accept())); // hruler mainlayout->addSpacing(5); @@ -112,14 +112,14 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE) buttonlayout->addSpacing(5); KButtonBox *bbox = new KButtonBox(this); - bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() )); + bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() )); bbox->addStretch(1); TQButton *okbutton = bbox->addButton(KStdGuiItem::ok()); - connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) ); + connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) ); TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel()); - connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) ); + connect( cancelbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(reject() ) ); bbox->layout(); //min_size(bbox); @@ -172,7 +172,7 @@ void InterfaceDlg::update() void InterfaceDlg::help() { - TDEApplication::kApplication()->invokeHelp("", "karts"); + tdeApp->invokeHelp("", "karts"); } #include "interfacedlg.moc" diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp index 1d7bbce9..d8cf6224 100644 --- a/arts/builder/main.cpp +++ b/arts/builder/main.cpp @@ -52,7 +52,7 @@ #include <ksavefile.h> #include <tdemessagebox.h> #include <tdeaboutdata.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kartsserver.h> #include <tqfile.h> #include <tqpopupmenu.h> @@ -146,7 +146,7 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name) arts_debug("PORT: modulewidget"); modulewidget = new ModuleWidget(structure, mainDock, "mwidget"); mainDock->setWidget(modulewidget); - connect(modulewidget, TQT_SIGNAL(modified(bool)), TQT_SLOT(setModified(bool))); + connect(modulewidget, TQ_SIGNAL(modified(bool)), TQ_SLOT(setModified(bool))); arts_debug("PORT: modulewidget ok"); // allow others to dock to the 4 sides @@ -167,20 +167,20 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name) 80); // relation target/this (in percent) // selection - connect(modulewidget, TQT_SIGNAL(portSelected(ModulePort *)), - propertyPanel, TQT_SLOT (setSelectedPort(ModulePort *))); - connect(propertyPanel, TQT_SIGNAL(portSelected(ModulePort *)), - modulewidget, TQT_SLOT (selectPort(ModulePort *))); - connect(modulewidget, TQT_SIGNAL(componentSelected(StructureComponent *)), - propertyPanel, TQT_SLOT (setSelectedComponent(StructureComponent *))); + connect(modulewidget, TQ_SIGNAL(portSelected(ModulePort *)), + propertyPanel, TQ_SLOT (setSelectedPort(ModulePort *))); + connect(propertyPanel, TQ_SIGNAL(portSelected(ModulePort *)), + modulewidget, TQ_SLOT (selectPort(ModulePort *))); + connect(modulewidget, TQ_SIGNAL(componentSelected(StructureComponent *)), + propertyPanel, TQ_SLOT (setSelectedComponent(StructureComponent *))); // connection - connect(propertyPanel, TQT_SIGNAL(startConnection(ModulePort *)), - modulewidget, TQT_SLOT (startConnection(ModulePort *))); + connect(propertyPanel, TQ_SIGNAL(startConnection(ModulePort *)), + modulewidget, TQ_SLOT (startConnection(ModulePort *))); // port properties changed - connect(propertyPanel, TQT_SIGNAL(portPropertiesChanged(ModulePort *)), - modulewidget, TQT_SLOT (portPropertiesChanged(ModulePort *))); + connect(propertyPanel, TQ_SIGNAL(portPropertiesChanged(ModulePort *)), + modulewidget, TQ_SLOT (portPropertiesChanged(ModulePort *))); arts_debug("PORT: setcanvas"); structure->setCanvas(modulewidget); @@ -251,25 +251,25 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name) */ #if 000 - connect(menubar, TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(activateMenu(int))); - connect(m_view, TQT_SIGNAL(activated(int)), modulewidget, TQT_SLOT(setZoom(int))); - connect(m_ports, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addPort(int))); - connect(m_file_new, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(fileNew(int))); + connect(menubar, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(activateMenu(int))); + connect(m_view, TQ_SIGNAL(activated(int)), modulewidget, TQ_SLOT(setZoom(int))); + connect(m_ports, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addPort(int))); + connect(m_file_new, TQ_SIGNAL(activated(int)), this, TQ_SLOT(fileNew(int))); - //connect(m_modules, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int))); + //connect(m_modules, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addModule(int))); /* - connect(m_modules_synth, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int))); - connect(m_modules_gui, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int))); - connect(m_modules_instruments, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int))); - connect(m_modules_other, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int))); + connect(m_modules_synth, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addModule(int))); + connect(m_modules_gui, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addModule(int))); + connect(m_modules_instruments, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addModule(int))); + connect(m_modules_other, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addModule(int))); */ - connect(kapp, TQT_SIGNAL(lastWindowClosed()), this , TQT_SLOT(quit())); + connect(tdeApp, TQ_SIGNAL(lastWindowClosed()), this , TQ_SLOT(quit())); // update the modules menu once for the start #endif arts_debug("PORT: activatemenu"); - connect(menumaker, TQT_SIGNAL(activated(const char *)), TQT_TQOBJECT(this), TQT_SLOT(addModule(const char *))); + connect(menumaker, TQ_SIGNAL(activated(const char *)), this, TQ_SLOT(addModule(const char *))); fillModuleMenu(); arts_debug("PORT: activatemenu ok"); setupActions(); @@ -279,7 +279,7 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name) // connect to aboutToShow to correctly show state of dockwidget there: TQPopupMenu *viewmenu = (TQPopupMenu*)factory()->container("view", this); if (viewmenu) - connect(viewmenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(viewMenuAboutToShow())); + connect(viewmenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(viewMenuAboutToShow())); else arts_debug("view menu not found!"); @@ -292,55 +292,55 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name) void ArtsBuilderWindow::setupActions() { // File menu - KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); - (void)new TDEAction(i18n("Open Session..."), 0, TQT_TQOBJECT(this), TQT_SLOT(openSession()), + (void)new TDEAction(i18n("Open Session..."), 0, this, TQ_SLOT(openSession()), actionCollection(), "file_open_session"); - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection()); - (void)new TDEAction(i18n("Open E&xample..."), TQt::CTRL + TQt::Key_X, TQT_TQOBJECT(this), TQT_SLOT(openExample()), + KStdAction::open(this, TQ_SLOT(open()), actionCollection()); + (void)new TDEAction(i18n("Open E&xample..."), TQt::CTRL + TQt::Key_X, this, TQ_SLOT(openExample()), actionCollection(), "file_open_example"); - KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); - KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection()); - (void)new TDEAction(i18n("&Retrieve From Server..."), TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(retrieve()), + KStdAction::save(this, TQ_SLOT(save()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection()); + (void)new TDEAction(i18n("&Retrieve From Server..."), TQt::CTRL + TQt::Key_R, this, TQ_SLOT(retrieve()), actionCollection(), "file_retrieve_from_server"); - (void)new TDEAction(i18n("&Execute Structure"), "artsbuilderexecute", TQt::CTRL + TQt::Key_E, TQT_TQOBJECT(this), TQT_SLOT(execute()), + (void)new TDEAction(i18n("&Execute Structure"), "artsbuilderexecute", TQt::CTRL + TQt::Key_E, this, TQ_SLOT(execute()), actionCollection(), "file_execute_structure"); - (void)new TDEAction(i18n("&Rename Structure..."), TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(rename()), + (void)new TDEAction(i18n("&Rename Structure..."), TQt::CTRL + TQt::Key_R, this, TQ_SLOT(rename()), actionCollection(), "file_rename_structure"); - (void)new TDEAction(i18n("&Publish Structure"), TQt::CTRL + TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT(publish()), + (void)new TDEAction(i18n("&Publish Structure"), TQt::CTRL + TQt::Key_P, this, TQ_SLOT(publish()), actionCollection(), "file_publish_structure"); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); // Edit menu - (void)new TDEAction(i18n("&Delete"), TQt::Key_Delete, TQT_TQOBJECT(modulewidget), TQT_SLOT(delModule()), + (void)new TDEAction(i18n("&Delete"), TQt::Key_Delete, modulewidget, TQ_SLOT(delModule()), actionCollection(), "edit_delete"); - KStdAction::selectAll(TQT_TQOBJECT(modulewidget), TQT_SLOT(selectAll()), actionCollection()); + KStdAction::selectAll(modulewidget, TQ_SLOT(selectAll()), actionCollection()); // View menu viewPropertiesAction= new TDEToggleAction(i18n("&Property Panel"), 0, - TQT_TQOBJECT(propertyDock), TQT_SLOT(changeHideShowState()), + propertyDock, TQ_SLOT(changeHideShowState()), actionCollection(), "view_properties"); - (void)new TDEAction(i18n("200%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt200()), + (void)new TDEAction(i18n("200%"), 0, this, TQ_SLOT(viewAt200()), actionCollection(), "view_200"); - (void)new TDEAction(i18n("150%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt150()), + (void)new TDEAction(i18n("150%"), 0, this, TQ_SLOT(viewAt150()), actionCollection(), "view_150"); - (void)new TDEAction(i18n("100%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt100()), + (void)new TDEAction(i18n("100%"), 0, this, TQ_SLOT(viewAt100()), actionCollection(), "view_100"); - (void)new TDEAction(i18n("50%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt50()), + (void)new TDEAction(i18n("50%"), 0, this, TQ_SLOT(viewAt50()), actionCollection(), "view_50"); // Ports menu - (void)new TDEAction(i18n("Create IN Audio Signal"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInAudioSignal()), + (void)new TDEAction(i18n("Create IN Audio Signal"), 0, this, TQ_SLOT(createInAudioSignal()), actionCollection(), "ports_create_in_audio_signal"); - (void)new TDEAction(i18n("Create OUT Audio Signal"), 0, TQT_TQOBJECT(this), TQT_SLOT(createOutAudioSignal()), + (void)new TDEAction(i18n("Create OUT Audio Signal"), 0, this, TQ_SLOT(createOutAudioSignal()), actionCollection(), "ports_create_out_audio_signal"); - (void)new TDEAction(i18n("Create IN String Property"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInStringProperty()), + (void)new TDEAction(i18n("Create IN String Property"), 0, this, TQ_SLOT(createInStringProperty()), actionCollection(), "ports_create_in_string_property"); - (void)new TDEAction(i18n("Create IN Audio Property"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInAudioProperty()), + (void)new TDEAction(i18n("Create IN Audio Property"), 0, this, TQ_SLOT(createInAudioProperty()), actionCollection(), "ports_create_in_audio_property"); - (void)new TDEAction(i18n("Implement Interface..."), 0, TQT_TQOBJECT(this), TQT_SLOT(addInterface()), + (void)new TDEAction(i18n("Implement Interface..."), 0, this, TQ_SLOT(addInterface()), actionCollection(), "ports_implement_interface"); - (void)new TDEAction(i18n("Change Positions/Names..."), 0, TQT_TQOBJECT(this), TQT_SLOT(changePortPositions()), + (void)new TDEAction(i18n("Change Positions/Names..."), 0, this, TQ_SLOT(changePortPositions()), actionCollection(), "ports_change_positions"); } @@ -422,7 +422,7 @@ void ArtsBuilderWindow::quit() { if(execDlg) return; arts_debug(">> ArtsBuilderWindow::quit() called"); - kapp->quit(); + tdeApp->quit(); arts_debug("<< leaving ArtsBuilderWindow::quit()"); } @@ -532,7 +532,7 @@ void ArtsBuilderWindow::openSession() execDlg->start(); execDlg->show(); - connect(execDlg, TQT_SIGNAL(ready()), TQT_TQOBJECT(this), TQT_SLOT(endexecute())); + connect(execDlg, TQ_SIGNAL(ready()), this, TQ_SLOT(endexecute())); hide(); // m_filename = filename; FIXME: DOESN'T THIS BELONG HERE? @@ -674,7 +674,7 @@ void ArtsBuilderWindow::execute() execDlg->start(); execDlg->show(); - connect(execDlg, TQT_SIGNAL(ready()), TQT_TQOBJECT(this), TQT_SLOT(endexecute())); + connect(execDlg, TQ_SIGNAL(ready()), this, TQ_SLOT(endexecute())); hide(); } diff --git a/arts/builder/main.h b/arts/builder/main.h index 135e3bc4..5fd9b8bf 100644 --- a/arts/builder/main.h +++ b/arts/builder/main.h @@ -27,7 +27,7 @@ #include <kdockwidget.h> #include <tdeapplication.h> #include <tdefiledialog.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <list> diff --git a/arts/builder/menumaker.cpp b/arts/builder/menumaker.cpp index 8045091b..33784652 100644 --- a/arts/builder/menumaker.cpp +++ b/arts/builder/menumaker.cpp @@ -10,7 +10,7 @@ MenuEntry::MenuEntry(MenuMaker *menumaker, TDEActionMenu *parent, const char *te { action = new TDEAction(TQString::fromLocal8Bit(text)); parent->insert(action); - connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(activated())); + connect(action, TQ_SIGNAL(activated()), this, TQ_SLOT(activated())); } void MenuEntry::activated() @@ -93,7 +93,7 @@ void MenuMaker::addCategory(const TQString& name, const char *prefix) TDEActionMenu *newMenu = new TDEActionMenu(catname(name)); pc->menu()->insert(newMenu); /* 000 */ - /*connect(newMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(menuactivated(int))); + /*connect(newMenu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(menuactivated(int))); pc->menu()->insertItem(catname(name).c_str(), newMenu, CAT_MAGIC_ID);*/ arts_debug("inserting a menu called '%s' in the parent menu '%s'", catname(name).local8Bit().data(),pc->name().local8Bit().data()); diff --git a/arts/builder/module.h b/arts/builder/module.h index 44466bc0..1d323b82 100644 --- a/arts/builder/module.h +++ b/arts/builder/module.h @@ -27,7 +27,7 @@ #include <tqpixmap.h> #include <tqstring.h> #include <tqrect.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include "artsbuilder.h" #include "scomponent.h" diff --git a/arts/builder/mwidget.cpp b/arts/builder/mwidget.cpp index 31b03b6f..7bfd506e 100644 --- a/arts/builder/mwidget.cpp +++ b/arts/builder/mwidget.cpp @@ -637,11 +637,11 @@ ModuleWidget::ModuleWidget(Structure *structure, TQWidget *parent, const char *n arts_debug("PORT: mw; new ar ok - qtimer"); TQTimer *timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(autoRedrawRouter()) ); + connect( timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(autoRedrawRouter()) ); arts_debug("PORT: mw; tstart"); - timer->start( 100, FALSE ); // 100 ms reoccurring check + timer->start( 100, false ); // 100 ms reoccurring check } ModuleWidget::~ModuleWidget() diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp index 2bf9dbe4..36fa7e93 100644 --- a/arts/builder/portposdlg.cpp +++ b/arts/builder/portposdlg.cpp @@ -40,7 +40,7 @@ using namespace std; -PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,"Props", TRUE) +PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,"Props", true) { this->structure = structure; @@ -111,27 +111,27 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent, buttonlayout->addSpacing(5); KButtonBox *bbox = new KButtonBox(this); - bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() )); + bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() )); bbox->addStretch(1); TDEIconLoader iconloader; TQButton *raise = bbox->addButton(i18n("&Raise")); raise->setPixmap(iconloader.loadIcon("go-up", TDEIcon::Small)); - connect( raise, TQT_SIGNAL( clicked() ), TQT_SLOT( raise() )); + connect( raise, TQ_SIGNAL( clicked() ), TQ_SLOT( raise() )); TQButton *lower = bbox->addButton(i18n("&Lower")); lower->setPixmap(iconloader.loadIcon("go-down", TDEIcon::Small)); - connect( lower, TQT_SIGNAL( clicked() ), TQT_SLOT( lower() )); + connect( lower, TQ_SIGNAL( clicked() ), TQ_SLOT( lower() )); TQButton *rename = bbox->addButton(i18n("R&ename...")); - connect( rename, TQT_SIGNAL( clicked() ), TQT_SLOT( rename() )); + connect( rename, TQ_SIGNAL( clicked() ), TQ_SLOT( rename() )); TQButton *okbutton = bbox->addButton(KStdGuiItem::ok()); - connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) ); + connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) ); /* TQButton *cancelbutton = bbox->addButton(i18n("Cancel")); - connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) ); + connect( cancelbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(reject() ) ); */ bbox->layout(); //min_size(bbox); @@ -252,7 +252,7 @@ void PortPosDlg::update() void PortPosDlg::help() { - TDEApplication::kApplication()->invokeHelp("", "karts"); + tdeApp->invokeHelp("", "karts"); } #include "portposdlg.moc" diff --git a/arts/builder/propertypanel.cpp b/arts/builder/propertypanel.cpp index 9f306d15..46615711 100644 --- a/arts/builder/propertypanel.cpp +++ b/arts/builder/propertypanel.cpp @@ -43,20 +43,20 @@ PropertyPanel::PropertyPanel( TQWidget* parent, const char* name, WFlags fl ) { setTitleFont(); setTitleColors(); - connect( kapp, TQT_SIGNAL( tdedisplayFontChanged() ), - this, TQT_SLOT( setTitleFont() )); - connect( kapp, TQT_SIGNAL( tdedisplayPaletteChanged() ), - this, TQT_SLOT( setTitleColors() )); - connect( portValueGroup, TQT_SIGNAL( clicked(int) ), - this, TQT_SLOT( pvModeChanged(int) )); - connect( constantValueEdit, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( writePortProperties() )); - connect( constantValueComboBox, TQT_SIGNAL( activated(int) ), - this, TQT_SLOT( writePortProperties() )); - connect( portCombo, TQT_SIGNAL( activated(int) ), - this, TQT_SLOT( comboPortSelected(int) )); - connect( connectButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( connectButtonClicked() )); + connect( tdeApp, TQ_SIGNAL( tdedisplayFontChanged() ), + this, TQ_SLOT( setTitleFont() )); + connect( tdeApp, TQ_SIGNAL( tdedisplayPaletteChanged() ), + this, TQ_SLOT( setTitleColors() )); + connect( portValueGroup, TQ_SIGNAL( clicked(int) ), + this, TQ_SLOT( pvModeChanged(int) )); + connect( constantValueEdit, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( writePortProperties() )); + connect( constantValueComboBox, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT( writePortProperties() )); + connect( portCombo, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT( comboPortSelected(int) )); + connect( connectButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( connectButtonClicked() )); constantValueComboBox->hide(); setEnabled( false ); @@ -355,12 +355,12 @@ bool PropertyPanel::eventFilter( TQObject *o, TQEvent *e ) constantValueEdit->setText( entered ); constantValueEdit->setFocus(); // kdDebug() << "keyPress used in propPanel" << endl; - return TRUE; // eat event + return true; // eat event } } // else // kdDebug() << "event type = " << e->type() << " != " << TQEvent::KeyPress << endl; - return FALSE; // PropertyPanelBase::eventFilter( o, e ); + return false; // PropertyPanelBase::eventFilter( o, e ); } bool PropertyPanel::isEnum(const std::string& type) diff --git a/arts/builder/propertypanelbase.ui b/arts/builder/propertypanelbase.ui index 0ff20382..875f6813 100644 --- a/arts/builder/propertypanelbase.ui +++ b/arts/builder/propertypanelbase.ui @@ -355,8 +355,8 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">setTitleFont()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/arts/builder/qttableview.cpp b/arts/builder/qttableview.cpp index 3a2cac42..827b96d2 100644 --- a/arts/builder/qttableview.cpp +++ b/arts/builder/qttableview.cpp @@ -108,7 +108,7 @@ void TQCornerSquare::paintEvent( TQPaintEvent * ) \warning the functions setNumRows(), setNumCols(), setCellHeight(), setCellWidth(), setTableFlags() and clearTableFlags() may cause virtual functions such as cellWidth() and cellHeight() to be called, - even if autoUpdate() is FALSE. This may cause errors if relevant + even if autoUpdate() is false. This may cause errors if relevant state variables are not initialized. \warning Experience has shown that use of this widget tends to cause @@ -215,7 +215,7 @@ void QtTableView::show() Repaints the table view directly by calling paintEvent() directly unless updates are disabled. - Erases the view area \a (x,y,w,h) if \a erase is TRUE. Parameters \a + Erases the view area \a (x,y,w,h) if \a erase is true. Parameters \a (x,y) are in \e widget coordinates. If \a w is negative, it is replaced with <code>width() - x</code>. @@ -250,7 +250,7 @@ void QtTableView::repaint( int x, int y, int w, int h, bool erase ) /*! \overload void QtTableView::repaint( const TQRect &r, bool erase ) - Replaints rectangle \a r. If \a erase is TRUE draws the background + Repaints rectangle \a r. If \a erase is true draws the background using the palette's background. */ @@ -464,7 +464,7 @@ void QtTableView::setYOffset( int y ) in the view. Parameters \a (x,y) are in \e table coordinates. The interaction with \link setTableFlags() Tbl_snapTo*Grid \endlink - is tricky. If \a updateScrBars is TRUE, the scroll bars are + is tricky. If \a updateScrBars is true, the scroll bars are updated. \sa xOffset(), yOffset(), setXOffset(), setYOffset(), setTopLeftCell() @@ -707,8 +707,8 @@ int QtTableView::totalHeight() /*! \fn bool QtTableView::testTableFlags( uint f ) const - Returns TRUE if any of the table flags in \a f are currently set, - otherwise FALSE. + Returns true if any of the table flags in \a f are currently set, + otherwise false. \sa setTableFlags(), clearTableFlags(), tableFlags() */ @@ -717,7 +717,7 @@ int QtTableView::totalHeight() Sets the table flags to \a f. If a flag setting changes the appearance of the table, the table is - repainted if - and only if - autoUpdate() is TRUE. + repainted if - and only if - autoUpdate() is true. The table flags are mostly single bits, though there are some multibit flags for convenience. Here is a complete list: @@ -784,15 +784,15 @@ void QtTableView::setTableFlags( uint f ) tFlags |= f; bool updateOn = autoUpdate(); - setAutoUpdate( FALSE ); + setAutoUpdate( false ); uint repaintMask = Tbl_cutCellsV | Tbl_cutCellsH; if ( f & Tbl_vScrollBar ) { - setVerScrollBar( TRUE ); + setVerScrollBar( true ); } if ( f & Tbl_hScrollBar ) { - setHorScrollBar( TRUE ); + setHorScrollBar( true ); } if ( f & Tbl_autoVScrollBar ) { updateScrollBars( verRange ); @@ -822,7 +822,7 @@ void QtTableView::setTableFlags( uint f ) } if ( updateOn ) { - setAutoUpdate( TRUE ); + setAutoUpdate( true ); updateScrollBars(); if ( isVisible() && (f & repaintMask) ) repaint(); @@ -850,15 +850,15 @@ void QtTableView::clearTableFlags( uint f ) tFlags &= ~f; bool updateOn = autoUpdate(); - setAutoUpdate( FALSE ); + setAutoUpdate( false ); uint repaintMask = Tbl_cutCellsV | Tbl_cutCellsH; if ( f & Tbl_vScrollBar ) { - setVerScrollBar( FALSE ); + setVerScrollBar( false ); } if ( f & Tbl_hScrollBar ) { - setHorScrollBar( FALSE ); + setHorScrollBar( false ); } if ( f & Tbl_scrollLastHCell ) { int maxX = maxXOffset(); @@ -891,7 +891,7 @@ void QtTableView::clearTableFlags( uint f ) updateScrollBars( verRange ); } if ( updateOn ) { - setAutoUpdate( TRUE ); + setAutoUpdate( true ); updateScrollBars(); // returns immediately if nothing to do if ( isVisible() && (f & repaintMask) ) repaint(); @@ -903,7 +903,7 @@ void QtTableView::clearTableFlags( uint f ) /*! \fn bool QtTableView::autoUpdate() const - Returns TRUE if the view updates itself automatically whenever it + Returns true if the view updates itself automatically whenever it is changed in some way. \sa setAutoUpdate() @@ -912,11 +912,11 @@ void QtTableView::clearTableFlags( uint f ) /*! Sets the auto-update option of the table view to \a enable. - If \a enable is TRUE (this is the default), the view updates itself + If \a enable is true (this is the default), the view updates itself automatically whenever it has changed in some way (for example, when a \link setTableFlags() flag\endlink is changed). - If \a enable is FALSE, the view does NOT repaint itself or update + If \a enable is false, the view does NOT repaint itself or update its internal state variables when it is changed. This can be useful to avoid flicker during large changes and is singularly useless otherwise. Disable auto-update, do the changes, re-enable @@ -926,7 +926,7 @@ void QtTableView::clearTableFlags( uint f ) (i.e., between events). If, for example, the user interacts with the view when auto-update is off, strange things can happen. - Setting auto-update to TRUE does not repaint the view; you must call + Setting auto-update to true does not repaint the view; you must call repaint() to do this. \sa autoUpdate(), repaint() @@ -947,7 +947,7 @@ void QtTableView::setAutoUpdate( bool enable ) /*! Repaints the cell at row \a row, column \a col if it is inside the view. - If \a erase is TRUE, the relevant part of the view is cleared to the + If \a erase is true, the relevant part of the view is cleared to the background color/pixmap before the contents are repainted. \sa isVisible() @@ -1043,7 +1043,7 @@ int QtTableView::lastColVisible() const } /*! - Returns TRUE if \a row is at least partially visible. + Returns true if \a row is at least partially visible. \sa colIsVisible() */ @@ -1053,7 +1053,7 @@ bool QtTableView::rowIsVisible( int row ) const } /*! - Returns TRUE if \a col is at least partially visible. + Returns true if \a col is at least partially visible. \sa rowIsVisible() */ @@ -1093,10 +1093,10 @@ void QtTableView::coverCornerSquare( bool enable ) \internal Scroll the view to a position such that: - If \a horizontal is TRUE, the leftmost column shown fits snugly + If \a horizontal is true, the leftmost column shown fits snugly with the left edge of the view. - If \a vertical is TRUE, the top row shown fits snugly with the top + If \a vertical is true, the top row shown fits snugly with the top of the view. You can achieve the same effect automatically by setting any of the @@ -1142,7 +1142,7 @@ void QtTableView::horSbValue( int val ) tFlags |= Tbl_snapToHGrid; } } - setOffset( val, yOffs, FALSE ); + setOffset( val, yOffs, false ); } /*! @@ -1158,10 +1158,10 @@ void QtTableView::horSbSliding( int val ) if ( testTableFlags(Tbl_snapToHGrid) && testTableFlags(Tbl_smoothHScrolling) ) { tFlags &= ~Tbl_snapToHGrid; // turn off snapping while sliding - setOffset( val, yOffs, FALSE ); + setOffset( val, yOffs, false ); tFlags |= Tbl_snapToHGrid; // turn on snapping again } else { - setOffset( val, yOffs, FALSE ); + setOffset( val, yOffs, false ); } } @@ -1175,7 +1175,7 @@ void QtTableView::horSbSlidingDone( ) { if ( testTableFlags(Tbl_snapToHGrid) && testTableFlags(Tbl_smoothHScrolling) ) - snapToGrid( TRUE, FALSE ); + snapToGrid( true, false ); } /*! @@ -1196,7 +1196,7 @@ void QtTableView::verSbValue( int val ) tFlags |= Tbl_snapToVGrid; } } - setOffset( xOffs, val, FALSE ); + setOffset( xOffs, val, false ); } /*! @@ -1212,10 +1212,10 @@ void QtTableView::verSbSliding( int val ) if ( testTableFlags(Tbl_snapToVGrid) && testTableFlags(Tbl_smoothVScrolling) ) { tFlags &= ~Tbl_snapToVGrid; // turn off snapping while sliding - setOffset( xOffs, val, FALSE ); + setOffset( xOffs, val, false ); tFlags |= Tbl_snapToVGrid; // turn on snapping again } else { - setOffset( xOffs, val, FALSE ); + setOffset( xOffs, val, false ); } } @@ -1229,7 +1229,7 @@ void QtTableView::verSbSlidingDone( ) { if ( testTableFlags(Tbl_snapToVGrid) && testTableFlags(Tbl_smoothVScrolling) ) - snapToGrid( FALSE, TRUE ); + snapToGrid( false, true ); } @@ -1280,7 +1280,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) TQPainter paint( this ); - if ( !contentsRect().contains( updateR, TRUE ) ) {// update frame ? + if ( !contentsRect().contains( updateR, true ) ) {// update frame ? drawFrame( &paint ); if ( updateR.left() < frameWidth() ) //### updateR.setLeft( frameWidth() ); @@ -1346,7 +1346,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt paint.setClipRect( cellUR ); paintCell( &paint, row, col ); - paint.setClipping( FALSE ); + paint.setClipping( false ); } else { paintCell( &paint, row, col ); } @@ -1358,7 +1358,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt paint.setClipRect( cellUR ); paintCell( &paint, row, col ); - paint.setClipping( FALSE ); + paint.setClipping( false ); } else { paintCell( &paint, row, col ); } @@ -1379,7 +1379,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) // Note that this needs to be done regardless whether we do // eraseInPaint or not. Reason: a subclass may implement - // flicker-freeness and encourage the use of repaint(FALSE). + // flicker-freeness and encourage the use of repaint(false). // The subclass, however, cannot draw all pixels, just those // inside the cells. So QtTableView is reponsible for all pixels // outside the cells. @@ -1445,14 +1445,14 @@ TQScrollBar *QtTableView::verticalScrollBar() const #endif sb->resize( sb->sizeHint() ); // height is irrelevant TQ_CHECK_PTR(sb); - sb->setTracking( FALSE ); + sb->setTracking( false ); sb->setFocusPolicy( TQWidget::NoFocus ); - connect( sb, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(verSbValue(int))); - connect( sb, TQT_SIGNAL(sliderMoved(int)), - TQT_SLOT(verSbSliding(int))); - connect( sb, TQT_SIGNAL(sliderReleased()), - TQT_SLOT(verSbSlidingDone())); + connect( sb, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(verSbValue(int))); + connect( sb, TQ_SIGNAL(sliderMoved(int)), + TQ_SLOT(verSbSliding(int))); + connect( sb, TQ_SIGNAL(sliderReleased()), + TQ_SLOT(verSbSlidingDone())); sb->hide(); that->vScrollBar = sb; return sb; @@ -1477,13 +1477,13 @@ TQScrollBar *QtTableView::horizontalScrollBar() const sb->resize( sb->sizeHint() ); // width is irrelevant sb->setFocusPolicy( TQWidget::NoFocus ); TQ_CHECK_PTR(sb); - sb->setTracking( FALSE ); - connect( sb, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(horSbValue(int))); - connect( sb, TQT_SIGNAL(sliderMoved(int)), - TQT_SLOT(horSbSliding(int))); - connect( sb, TQT_SIGNAL(sliderReleased()), - TQT_SLOT(horSbSlidingDone())); + sb->setTracking( false ); + connect( sb, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(horSbValue(int))); + connect( sb, TQ_SIGNAL(sliderMoved(int)), + TQ_SLOT(horSbSliding(int))); + connect( sb, TQ_SIGNAL(sliderReleased()), + TQ_SLOT(horSbSlidingDone())); sb->hide(); that->hScrollBar = sb; return sb; @@ -1506,14 +1506,14 @@ void QtTableView::setHorScrollBar( bool on, bool update ) else sbDirty = sbDirty | (horMask | verMask); if ( testTableFlags( Tbl_vScrollBar ) ) - coverCornerSquare( TRUE ); + coverCornerSquare( true ); if ( autoUpdate() ) sbDirty = sbDirty | horMask; } else { tFlags &= ~Tbl_hScrollBar; if ( !hScrollBar ) return; - coverCornerSquare( FALSE ); + coverCornerSquare( false ); bool hideScrollBar = autoUpdate() && hScrollBar->isVisible(); if ( hideScrollBar ) hScrollBar->hide(); @@ -1545,14 +1545,14 @@ void QtTableView::setVerScrollBar( bool on, bool update ) else sbDirty = sbDirty | (horMask | verMask); if ( testTableFlags( Tbl_hScrollBar ) ) - coverCornerSquare( TRUE ); + coverCornerSquare( true ); if ( autoUpdate() ) sbDirty = sbDirty | verMask; } else { tFlags &= ~Tbl_vScrollBar; if ( !vScrollBar ) return; - coverCornerSquare( FALSE ); + coverCornerSquare( false ); bool hideScrollBar = autoUpdate() && vScrollBar->isVisible(); if ( hideScrollBar ) vScrollBar->hide(); @@ -1707,8 +1707,8 @@ int QtTableView::findCol( int xPos ) const /*! Computes the position in the widget of row \a row. - Returns TRUE and stores the result in \a *yPos (in \e widget - coordinates) if the row is visible. Returns FALSE and does not modify + Returns true and stores the result in \a *yPos (in \e widget + coordinates) if the row is visible. Returns false and does not modify \a *yPos if \a row is invisible or invalid. \sa colXPos(), findRow() @@ -1721,7 +1721,7 @@ bool QtTableView::rowYPos( int row, int *yPos ) const if ( cellH ) { int lastVisible = lastRowVisible(); if ( row > lastVisible || lastVisible == -1 ) - return FALSE; + return false; y = (row - yCellOffs)*cellH + minViewY() - yCellDelta; } else { //##arnt3 @@ -1732,23 +1732,23 @@ bool QtTableView::rowYPos( int row, int *yPos ) const while ( r < row && y <= maxY ) y += tw->cellHeight( r++ ); if ( y > maxY ) - return FALSE; + return false; } } else { - return FALSE; + return false; } if ( yPos ) *yPos = y; - return TRUE; + return true; } /*! Computes the position in the widget of column \a col. - Returns TRUE and stores the result in \a *xPos (in \e widget - coordinates) if the column is visible. Returns FALSE and does not + Returns true and stores the result in \a *xPos (in \e widget + coordinates) if the column is visible. Returns false and does not modify \a *xPos if \a col is invisible or invalid. \sa rowYPos(), findCol() @@ -1761,7 +1761,7 @@ bool QtTableView::colXPos( int col, int *xPos ) const if ( cellW ) { int lastVisible = lastColVisible(); if ( col > lastVisible || lastVisible == -1 ) - return FALSE; + return false; x = (col - xCellOffs)*cellW + minViewX() - xCellDelta; } else { //##arnt3 @@ -1772,14 +1772,14 @@ bool QtTableView::colXPos( int col, int *xPos ) const while ( c < col && x <= maxX ) x += tw->cellWidth( c++ ); if ( x > maxX ) - return FALSE; + return false; } } else { - return FALSE; + return false; } if ( xPos ) *xPos = x; - return TRUE; + return true; } @@ -1908,9 +1908,9 @@ void QtTableView::doAutoScrollBars() w += cellWidth( i++ ); } if ( w > viewW ) - hScrollOn = TRUE; + hScrollOn = true; else - hScrollOn = FALSE; + hScrollOn = false; } if ( testTableFlags(Tbl_autoVScrollBar) ) { @@ -1923,21 +1923,21 @@ void QtTableView::doAutoScrollBars() } if ( h > viewH ) - vScrollOn = TRUE; + vScrollOn = true; else - vScrollOn = FALSE; + vScrollOn = false; } if ( testTableFlags(Tbl_autoHScrollBar) && vScrollOn && !hScrollOn ) if ( w > viewW - VSBEXT ) - hScrollOn = TRUE; + hScrollOn = true; if ( testTableFlags(Tbl_autoVScrollBar) && hScrollOn && !vScrollOn ) if ( h > viewH - HSBEXT ) - vScrollOn = TRUE; + vScrollOn = true; - setHorScrollBar( hScrollOn, FALSE ); - setVerScrollBar( vScrollOn, FALSE ); + setHorScrollBar( hScrollOn, false ); + setVerScrollBar( vScrollOn, false ); updateFrameSize(); } @@ -2259,10 +2259,10 @@ void QtTableView::showOrHideScrollBars() void QtTableView::updateTableSize() { bool updateOn = autoUpdate(); - setAutoUpdate( FALSE ); + setAutoUpdate( false ); int xofs = xOffset(); xOffs++; //so that setOffset will not return immediately - setOffset(xofs,yOffset(),FALSE); //to calculate internal state correctly + setOffset(xofs,yOffset(),false); //to calculate internal state correctly setAutoUpdate(updateOn); updateScrollBars( horSteps | horRange | diff --git a/arts/builder/qttableview.h b/arts/builder/qttableview.h index 9a944432..39f5d757 100644 --- a/arts/builder/qttableview.h +++ b/arts/builder/qttableview.h @@ -32,9 +32,9 @@ public: virtual void setPalette( const TQPalette & ); void show(); - void repaint( bool erase=TRUE ); - void repaint( int x, int y, int w, int h, bool erase=TRUE ); - void repaint( const TQRect &, bool erase=TRUE ); + void repaint( bool erase=true ); + void repaint( int x, int y, int w, int h, bool erase=true ); + void repaint( const TQRect &, bool erase=true ); protected: QtTableView( TQWidget *parent=0, const char *name=0, WFlags f=0 ); @@ -55,7 +55,7 @@ protected: virtual void setXOffset( int ); int yOffset() const; virtual void setYOffset( int ); - virtual void setOffset( int x, int y, bool updateScrBars = TRUE ); + virtual void setOffset( int x, int y, bool updateScrBars = true ); virtual int cellWidth( int col ); virtual int cellHeight( int row ); @@ -75,7 +75,7 @@ protected: bool autoUpdate() const; virtual void setAutoUpdate( bool ); - void updateCell( int row, int column, bool erase=TRUE ); + void updateCell( int row, int column, bool erase=true ); TQRect cellUpdateRect() const; TQRect viewRect() const; @@ -129,13 +129,13 @@ protected: private: void coverCornerSquare( bool ); void snapToGrid( bool horizontal, bool vertical ); - virtual void setHorScrollBar( bool on, bool update = TRUE ); - virtual void setVerScrollBar( bool on, bool update = TRUE ); + virtual void setHorScrollBar( bool on, bool update = true ); + virtual void setVerScrollBar( bool on, bool update = true ); void updateView(); int findRawRow( int yPos, int *cellMaxY, int *cellMinY = 0, - bool goOutsideView = FALSE ) const; + bool goOutsideView = false ) const; int findRawCol( int xPos, int *cellMaxX, int *cellMinX = 0, - bool goOutsideView = FALSE ) const; + bool goOutsideView = false ) const; int maxColsVisible() const; void updateScrollBars( uint ); diff --git a/arts/builder/retrievedlg.cpp b/arts/builder/retrievedlg.cpp index c95d40ad..f6da1294 100644 --- a/arts/builder/retrievedlg.cpp +++ b/arts/builder/retrievedlg.cpp @@ -40,7 +40,7 @@ static void min_size(TQWidget *w) { w->setMinimumSize(w->sizeHint()); } -RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE) +RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", true) { setCaption(i18n("Retrieve Structure From Server")); @@ -104,14 +104,14 @@ RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE) buttonlayout->addSpacing(5); KButtonBox *bbox = new KButtonBox(this); - bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() )); + bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() )); bbox->addStretch(1); TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel()); - connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) ); + connect( cancelbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(reject() ) ); TQButton *okbutton = bbox->addButton(KStdGuiItem::ok()); - connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) ); + connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) ); bbox->layout(); @@ -132,6 +132,6 @@ TQString RetrieveDlg::result() void RetrieveDlg::help() { - TDEApplication::kApplication()->invokeHelp("", "karts"); + tdeApp->invokeHelp("", "karts"); } #include "retrievedlg.moc" diff --git a/arts/examples/README b/arts/examples/README index 425da5c0..2132bfc3 100644 --- a/arts/examples/README +++ b/arts/examples/README @@ -172,7 +172,7 @@ example_xfade.arts This example mixes 440 and 880 Hz sine waves using a cross fader. Adjust the value of the cross fader's percentage input from -1 to 1 to -control the mixing of the two Q_SIGNALS. +control the mixing of the two signals. example_pscale.arts diff --git a/arts/gui/common/CMakeLists.txt b/arts/gui/common/CMakeLists.txt index 030e3c65..8c7d45ad 100644 --- a/arts/gui/common/CMakeLists.txt +++ b/arts/gui/common/CMakeLists.txt @@ -29,7 +29,7 @@ link_directories( tde_add_library( artsgui_idl SHARED SOURCES artsgui.cpp VERSION 0.0.0 - LINK mcop ${DL_LIBRARIES} ${ARTS_LIBRARIES} + LINK mcop ${CMAKE_DL_LIBS} ${ARTS_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/arts/gui/kde/dbtest.cpp b/arts/gui/kde/dbtest.cpp index e1933b17..57a03730 100644 --- a/arts/gui/kde/dbtest.cpp +++ b/arts/gui/kde/dbtest.cpp @@ -12,7 +12,7 @@ dBTestWidget::dBTestWidget( TQWidget* p, const char* n ) : TQWidget( p,n ), dB2VolCalc( -24,6 ) { kdDebug() << k_funcinfo << endl; - ( void* ) KStdAction::quit( this, TQT_SLOT( close() ), new TDEActionCollection( this ) ); + ( void* ) KStdAction::quit( this, TQ_SLOT( close() ), new TDEActionCollection( this ) ); for ( float i=0; i<=1; i+=0.25 ) kdDebug() << i << " : " << amptodb( i ) << "dB" <<endl; diff --git a/arts/gui/kde/kartswidget.h b/arts/gui/kde/kartswidget.h index d33efa15..43cb0b95 100644 --- a/arts/gui/kde/kartswidget.h +++ b/arts/gui/kde/kartswidget.h @@ -46,7 +46,7 @@ class KArtsWidgetPrivate; * The KArtsWidget class keeps a reference to the content widget, so the * content widget will not be freed until the KArtsWidget gets destroyed. */ -class KDE_EXPORT KArtsWidget : public TQWidget { +class TDE_EXPORT KArtsWidget : public TQWidget { private: KArtsWidgetPrivate *d; diff --git a/arts/gui/kde/kbutton_impl.cpp b/arts/gui/kde/kbutton_impl.cpp index 752761b2..dfe4678f 100644 --- a/arts/gui/kde/kbutton_impl.cpp +++ b/arts/gui/kde/kbutton_impl.cpp @@ -33,10 +33,10 @@ KButtonMapper::KButtonMapper( KButton_impl *_impl, TQPushButton *but ) , impl( _impl ) , button( but ) { - connect( but, TQT_SIGNAL( pressed() ), this, TQT_SLOT( pressed() ) ); - connect( but, TQT_SIGNAL( released() ), this, TQT_SLOT( released() ) ); - connect( but, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggled( bool ) ) ); - connect( but, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) ); + connect( but, TQ_SIGNAL( pressed() ), this, TQ_SLOT( pressed() ) ); + connect( but, TQ_SIGNAL( released() ), this, TQ_SLOT( released() ) ); + connect( but, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( toggled( bool ) ) ); + connect( but, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) ); } void KButtonMapper::pressed() diff --git a/arts/gui/kde/kcombobox_impl.cpp b/arts/gui/kde/kcombobox_impl.cpp index 1bbc36c7..fced3445 100644 --- a/arts/gui/kde/kcombobox_impl.cpp +++ b/arts/gui/kde/kcombobox_impl.cpp @@ -34,7 +34,7 @@ ComboBoxIntMapper::ComboBoxIntMapper(KComboBox_impl *impl, KComboBox *co) : TQObject( co, "map TQt signal to aRts" ) ,impl(impl) { - connect(co, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(activated(const TQString &))); + connect(co, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(activated(const TQString &))); } void ComboBoxIntMapper::activated(const TQString & newValue) diff --git a/arts/gui/kde/kfader_impl.cpp b/arts/gui/kde/kfader_impl.cpp index cda42179..b667056d 100644 --- a/arts/gui/kde/kfader_impl.cpp +++ b/arts/gui/kde/kfader_impl.cpp @@ -34,7 +34,7 @@ using namespace std; FaderIntMapper::FaderIntMapper(KFader_impl *impl, KFader *kp) :impl(impl) { - connect(kp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); + connect(kp, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(valueChanged(int))); } void FaderIntMapper::valueChanged(int pos) diff --git a/arts/gui/kde/kframe_impl.h b/arts/gui/kde/kframe_impl.h index 60d0be6b..a55d8271 100644 --- a/arts/gui/kde/kframe_impl.h +++ b/arts/gui/kde/kframe_impl.h @@ -26,7 +26,7 @@ class TQFrame; namespace Arts { -class KDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel, +class TDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel, public Arts::KWidget_impl { protected: diff --git a/arts/gui/kde/klabel_impl.h b/arts/gui/kde/klabel_impl.h index b27a4365..1b1c0a73 100644 --- a/arts/gui/kde/klabel_impl.h +++ b/arts/gui/kde/klabel_impl.h @@ -35,7 +35,7 @@ class RotateLabel; namespace Arts { -class KDE_EXPORT KLabel_impl : virtual public Arts::Label_skel, +class TDE_EXPORT KLabel_impl : virtual public Arts::Label_skel, public Arts::KFrame_impl { protected: diff --git a/arts/gui/kde/klayoutbox_impl.h b/arts/gui/kde/klayoutbox_impl.h index 976e89a2..c42fd146 100644 --- a/arts/gui/kde/klayoutbox_impl.h +++ b/arts/gui/kde/klayoutbox_impl.h @@ -32,7 +32,7 @@ class TQBoxLayout; namespace Arts { -class KDE_EXPORT KLayoutBox_impl : virtual public Arts::LayoutBox_skel, +class TDE_EXPORT KLayoutBox_impl : virtual public Arts::LayoutBox_skel, public Arts::KFrame_impl { protected: @@ -78,7 +78,7 @@ public: } // namespace -class KDE_EXPORT KLayoutBox_Separator : public TQWidget { +class TDE_EXPORT KLayoutBox_Separator : public TQWidget { TQ_OBJECT public: diff --git a/arts/gui/kde/klevelmeter_linebars.cpp b/arts/gui/kde/klevelmeter_linebars.cpp index e3a15ca2..1f3cd450 100644 --- a/arts/gui/kde/klevelmeter_linebars.cpp +++ b/arts/gui/kde/klevelmeter_linebars.cpp @@ -94,7 +94,7 @@ void KLevelMeter_LineBars::paintEvent( TQPaintEvent* ) { p.drawLine( 0, top, w, top ); } - bitBlt( TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&pm), 0, 0, pm.width(), pm.height(), CopyROP, true ); + bitBlt( this, 0, 0, &pm, 0, 0, pm.width(), pm.height(), CopyROP, true ); } /** diff --git a/arts/gui/kde/klineedit_impl.cpp b/arts/gui/kde/klineedit_impl.cpp index 6c3c907b..3054270e 100644 --- a/arts/gui/kde/klineedit_impl.cpp +++ b/arts/gui/kde/klineedit_impl.cpp @@ -29,8 +29,8 @@ using namespace std; KLineEditStringMapper::KLineEditStringMapper(KLineEdit_impl *impl, KLineEdit *ke) :impl(impl) { - connect(ke, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(textChanged(const TQString&))); + connect(ke, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(textChanged(const TQString&))); } void KLineEditStringMapper::textChanged(const TQString& newText) diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp index 8fc412a2..96a19e90 100644 --- a/arts/gui/kde/kpoti.cpp +++ b/arts/gui/kde/kpoti.cpp @@ -218,8 +218,8 @@ void KPoti::init(int value) potiPos = positionFromValue(value); clickOffset = 0; state = Idle; - track = TRUE; - ticks = TRUE; + track = true; + ticks = true; m_bLabel = true; tickInt = 0; @@ -263,8 +263,8 @@ void KPoti::initTicks() /** - Enables slider tracking if \e enable is TRUE, or disables tracking - if \e enable is FALSE. + Enables slider tracking if \e enable is true, or disables tracking + if \e enable is false. If tracking is enabled (default), the slider emits the valueChanged() signal whenever the slider is being dragged. If @@ -283,7 +283,7 @@ void KPoti::setTracking( bool enable ) /** \fn bool KPoti::tracking() const - Returns TRUE if tracking is enabled, or FALSE if tracking is disabled. + Returns true if tracking is enabled, or false if tracking is disabled. Tracking is initially enabled. @@ -495,15 +495,15 @@ void KPoti::mousePressEvent( TQMouseEvent *e ) subtractPage(); if ( !timer ) timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(repeatTimeout()) ); - timer->start( thresholdTime, TRUE ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(repeatTimeout()) ); + timer->start( thresholdTime, true ); } else { state = TimingUp; addPage(); if ( !timer ) timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(repeatTimeout()) ); - timer->start( thresholdTime, TRUE ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(repeatTimeout()) ); + timer->start( thresholdTime, true ); } } @@ -695,10 +695,10 @@ void KPoti::repeatTimeout() Q_ASSERT( timer ); timer->disconnect(); if ( state == TimingDown ) - connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(subtractStep()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(subtractStep()) ); else if ( state == TimingUp ) - connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(addStep()) ); - timer->start( repeatTime, FALSE ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(addStep()) ); + timer->start( repeatTime, false ); } diff --git a/arts/gui/kde/kpoti_impl.cpp b/arts/gui/kde/kpoti_impl.cpp index b5d4f043..fbf442f0 100644 --- a/arts/gui/kde/kpoti_impl.cpp +++ b/arts/gui/kde/kpoti_impl.cpp @@ -35,7 +35,7 @@ PotiIntMapper::PotiIntMapper(KPoti_impl *impl, KPoti *kp) : TQObject( kp ) , impl( impl ) { - connect(kp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); + connect(kp, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(valueChanged(int))); } void PotiIntMapper::valueChanged(int pos) diff --git a/arts/gui/kde/kspinbox_impl.cpp b/arts/gui/kde/kspinbox_impl.cpp index e352033c..877c080f 100644 --- a/arts/gui/kde/kspinbox_impl.cpp +++ b/arts/gui/kde/kspinbox_impl.cpp @@ -32,7 +32,7 @@ using namespace std; SpinBoxIntMapper::SpinBoxIntMapper(KSpinBox_impl *impl, TQSpinBox *sp) :impl(impl) { - connect(sp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); + connect(sp, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(valueChanged(int))); } void SpinBoxIntMapper::valueChanged(int pos) diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp index a45f91aa..4236e0cd 100644 --- a/arts/gui/kde/kvolumefader_impl.cpp +++ b/arts/gui/kde/kvolumefader_impl.cpp @@ -121,7 +121,7 @@ KVolumeFader_Widget::KVolumeFader_Widget( TQWidget* p, const char* n ) , _value( -1 ) , _dir( Arts::BottomToTop ) , _menu( new TDEPopupMenu( this ) ) - , _aExactValue( new TDEAction( i18n( "Set Exact Value..." ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( exactValue() ), TQT_TQOBJECT(this) ) ) + , _aExactValue( new TDEAction( i18n( "Set Exact Value..." ), TDEShortcut(), this, TQ_SLOT( exactValue() ), this ) ) { //kdDebug() << k_funcinfo << endl; setMinimumSize( 10,10 ); diff --git a/arts/gui/kde/kwidget_impl.cpp b/arts/gui/kde/kwidget_impl.cpp index 53ccb8ad..e44a818f 100644 --- a/arts/gui/kde/kwidget_impl.cpp +++ b/arts/gui/kde/kwidget_impl.cpp @@ -39,8 +39,8 @@ KWidget_impl::KWidget_impl( TQWidget * widget ) * the panel got deleted, our widget will be gone, too) */ _guard = new KWidgetGuard(this); - TQObject::connect(_qwidget, TQT_SIGNAL(destroyed()), - _guard, TQT_SLOT(widgetDestroyed())); + TQObject::connect(_qwidget, TQ_SIGNAL(destroyed()), + _guard, TQ_SLOT(widgetDestroyed())); } KWidget_impl::~KWidget_impl() diff --git a/arts/gui/kde/kwidget_impl.h b/arts/gui/kde/kwidget_impl.h index b0c74fa0..430e8c97 100644 --- a/arts/gui/kde/kwidget_impl.h +++ b/arts/gui/kde/kwidget_impl.h @@ -31,7 +31,7 @@ namespace Arts { class KWidgetGuard; -class KDE_EXPORT KWidget_impl : virtual public Arts::Widget_skel { +class TDE_EXPORT KWidget_impl : virtual public Arts::Widget_skel { protected: TQWidget * _qwidget; KWidgetGuard * _guard; diff --git a/arts/gui/kde/tdepopupbox_impl.cpp b/arts/gui/kde/tdepopupbox_impl.cpp index 9263fc0d..150cccb7 100644 --- a/arts/gui/kde/tdepopupbox_impl.cpp +++ b/arts/gui/kde/tdepopupbox_impl.cpp @@ -64,11 +64,11 @@ TDEPopupBox_widget::TDEPopupBox_widget( TQWidget *parent, const char* name ) : T _titlebarlayout->setAutoAdd( true ); _showbutton = new ShowButton( _titlebar ); - connect( _showbutton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( hide( bool ) ) ); + connect( _showbutton, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( hide( bool ) ) ); _drag = new HandleDrag( _titlebar ); - connect( _drag, TQT_SIGNAL( clicked() ), _showbutton, TQT_SLOT( toggle() ) ); + connect( _drag, TQ_SIGNAL( clicked() ), _showbutton, TQ_SLOT( toggle() ) ); _ownbutton = new OwnButton( _titlebar ); - connect( _ownbutton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( own( bool ) ) ); + connect( _ownbutton, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( own( bool ) ) ); _artswidget = new OwnWidget( _showbutton, this ); diff --git a/arts/gui/kde/tdepopupbox_private.h b/arts/gui/kde/tdepopupbox_private.h index 1df01f79..21fc3034 100644 --- a/arts/gui/kde/tdepopupbox_private.h +++ b/arts/gui/kde/tdepopupbox_private.h @@ -118,7 +118,7 @@ private: public: ShowButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name ), _dir( TQBoxLayout::LeftToRight ) { - connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( owntoggle( bool ) ) ); + connect( this, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( owntoggle( bool ) ) ); setToggleButton( true ); _pmleft = TQPixmap( const_cast<const char**>( left_xpm ) ); _pmright = TQPixmap( const_cast<const char**>( right_xpm ) ); @@ -174,7 +174,7 @@ private: public: OwnButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name ) { - connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggle( bool ) ) ); + connect( this, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( toggle( bool ) ) ); setToggleButton( true ); _pmown = TQPixmap( const_cast<const char**>( own_xpm ) ); _pminside = TQPixmap( const_cast<const char**>( inside_xpm ) ); diff --git a/arts/midi/midisend.h b/arts/midi/midisend.h index cd732055..f2782c29 100644 --- a/arts/midi/midisend.h +++ b/arts/midi/midisend.h @@ -45,7 +45,7 @@ class CMidiMap { public: /* Reads in the mapfile pszFileName. - Returns TRUE, if successful. + Returns true, if successful. */ bool readMap(const char* pszFileName); /* diff --git a/arts/midi/timestampmath.h b/arts/midi/timestampmath.h index 12131647..ee08996c 100644 --- a/arts/midi/timestampmath.h +++ b/arts/midi/timestampmath.h @@ -30,7 +30,7 @@ namespace Arts { /** * increments the timestamp by delta */ -KDE_EXPORT void timeStampInc(TimeStamp& t, const TimeStamp& delta); +TDE_EXPORT void timeStampInc(TimeStamp& t, const TimeStamp& delta); /** * decrements the timestamp by delta diff --git a/arts/modules/CMakeLists.txt b/arts/modules/CMakeLists.txt index fb6d07e2..0cc76da1 100644 --- a/arts/modules/CMakeLists.txt +++ b/arts/modules/CMakeLists.txt @@ -42,7 +42,7 @@ tde_add_library( artsmodules SHARED artsmodules.cpp VERSION 0.0.0 LINK - tdecore-shared ${DL_LIBRARIES} mcop artsflow + tdecore-shared ${CMAKE_DL_LIBS} mcop artsflow artsbuilder-shared artsgui_idl-shared artsmidi_idl-shared artsmodulescommon-shared artsmodulessynth-shared artsmoduleseffects-shared artsmodulesmixers-shared diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp index cc5b42de..d7f8d30b 100644 --- a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp +++ b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp @@ -30,7 +30,7 @@ using namespace Arts; KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* w ) : KLayoutBox_impl( w ? w : new TQFrame( 0 ) ) { //kdDebug()<<"KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* "<<w<<" )"<<endl; - _mapper = new KStereoVolumeControlGui_EventMapper( this, TQT_TQOBJECT(_qframe) ); + _mapper = new KStereoVolumeControlGui_EventMapper( this, _qframe ); this->addWidget( _label, -100 ); _label.bottom( Arts::East ); _label.text( "Volume" ); diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.h b/arts/modules/effects/kstereovolumecontrolgui_impl.h index 5f6da3be..ff5d96dd 100644 --- a/arts/modules/effects/kstereovolumecontrolgui_impl.h +++ b/arts/modules/effects/kstereovolumecontrolgui_impl.h @@ -88,7 +88,7 @@ public: public: KStereoVolumeControlGui_EventMapper( Arts::KStereoVolumeControlGui_impl* impl, TQObject* parent, const char* name=0 ) : TQObject( parent,name ), _impl( impl ) { _timer = new TQTimer( this ); - connect( _timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimerSignal() ) ); + connect( _timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimerSignal() ) ); } public slots: void slotTimerSignal() { _impl->updateValues(); } diff --git a/arts/modules/synth/c_filter_stuff.c b/arts/modules/synth/c_filter_stuff.c index 531d5015..c3a42697 100644 --- a/arts/modules/synth/c_filter_stuff.c +++ b/arts/modules/synth/c_filter_stuff.c @@ -42,8 +42,7 @@ /*#define SPN MINDOUBLE*/ #define SPN 0.00001 -double bw2angle(a,bw) -double a,bw; +double bw2angle(double a, double bw) { double T,d,sn,cs,mag,delta,theta,tmp,a2,a4,asnd; @@ -63,8 +62,8 @@ double a,bw; return(theta/(2.0*PI)); } -void presence(cf,boost,bw,a0,a1,a2,b1,b2) -double cf,boost,bw,*a0,*a1,*a2,*b1,*b2; +void presence(double cf, double boost, double bw, double *a0, + double *a1, double *a2, double *b1, double *b2) { double a,A,F,xfmbw,C,tmp,alphan,alphad,b0,recipb0,asq,F2,a2plus1,ma2plus1; @@ -100,8 +99,8 @@ double cf,boost,bw,*a0,*a1,*a2,*b1,*b2; *b2 *= recipb0; } -void shelve(cf,boost,a0,a1,a2,b1,b2) -double cf,boost,*a0,*a1,*a2,*b1,*b2; +void shelve(double cf, double boost, double *a0, double *a1, + double *a2, double *b1, double *b2) { double a,A,F,tmp,b0,recipb0,asq,F2,gamma2,siggam2,gam2p1; double gamman,gammad,ta0,ta1,ta2,tb0,tb1,tb2,aa1,ab1; @@ -160,9 +159,7 @@ void initfilter(filter *f) f->y = 0.0; } -void setfilter_presence(f,freq,boost,bw) -filter *f; -double freq,boost,bw; +void setfilter_presence(filter *f, double freq, double boost, double bw) { presence(freq/(double)SR,boost,bw/(double)SR, &f->cx,&f->cx1,&f->cx2,&f->cy1,&f->cy2); @@ -196,9 +193,7 @@ void setfilter_shelvelowpass(filter *f, double freq, double boost) * As in ''An introduction to digital filter theory'' by Julius O. Smith * and in Moore's book; I use the normalized version in Moore's book. */ -void setfilter_2polebp(f,freq,R) -filter *f; -double freq,R; +void setfilter_2polebp(filter *f, double freq, double R) { double theta; @@ -217,9 +212,7 @@ double freq,R; * for digital audio equalization * JAES, Vol. 34, No. 6, 1986 June */ -void setfilter_peaknotch(f,freq,M,bw) -filter *f; -double freq,M,bw; +void setfilter_peaknotch(filter *f, double freq, double M, double bw) { double w0,om,ta,d, p=0.0 /* prevents compiler warning */; @@ -244,9 +237,7 @@ double freq,M,bw; * Some JAES's article on ladder filter. * freq (Hz), gdb (dB), bw (Hz) */ -void setfilter_peaknotch2(f,freq,gdb,bw) -filter *f; -double freq,gdb,bw; +void setfilter_peaknotch2(filter *f, double freq, double gdb, double bw) { double k,w,bwr,abw,gain; @@ -262,9 +253,7 @@ double freq,gdb,bw; f->cy2 = -abw; } -double applyfilter(f,x) -filter *f; -double x; +double applyfilter(filter *f, double x) { f->x = x; f->y = f->cx * f->x + f->cx1 * f->x1 + f->cx2 * f->x2 @@ -281,8 +270,7 @@ double x; */ #if 0 -int saturate16(x) -double x; +int saturate16(double x) { if (x > 32765.0) { return(32765); @@ -291,9 +279,7 @@ double x; } else return((int)x); } -void initdelay(d,n) -delay *d; -int n; +void initdelay(delay *d, int n) { int i; @@ -304,8 +290,7 @@ int n; for(i = 0; i < n; i++) d->buf[i] = 0.0; } -double readdelay(d) -delay *d; +double readdelay(delay *d) { double y; @@ -315,18 +300,14 @@ delay *d; return(y); } -void writedelay(d,x) -delay *d; -double x; +void writedelay(delay *d, double x) { d->buf[d->wloc] = x; d->wloc++; if (d->wloc == d->len) d->wloc = 0; } -void initringbufferd(rb,n) -ringbufferd *rb; -int n; +void initringbufferd(ringbufferd *rb, int n) { int i; @@ -336,9 +317,7 @@ int n; for(i = 0; i < n; i++) rb->buf[i] = 0.0; } -double readringbufferd(rb,n) -ringbufferd *rb; -int n; +double readringbufferd(ringbufferd *rb, int n) { int i; @@ -348,18 +327,14 @@ int n; return(rb->buf[i]); } -void writeringbufferd(rb,x) -ringbufferd *rb; -double x; +void writeringbufferd(ringbufferd *rb, double x) { rb->buf[rb->wloc] = x; rb->wloc++; if (rb->wloc == rb->len) rb->wloc = 0; } -void initringbufferi(rb,n) -ringbufferi *rb; -int n; +void initringbufferi(ringbufferd *rb, int n) { int i; @@ -369,9 +344,7 @@ int n; for(i = 0; i < n; i++) rb->buf[i] = 0; } -int readringbufferi(rb,n) -ringbufferi *rb; -int n; +int readringbufferi(ringbufferd *rb, int n) { int i; @@ -381,9 +354,7 @@ int n; return(rb->buf[i]); } -void writeringbufferi(rb,x) -ringbufferi *rb; -int x; +void writeringbufferi(ringbufferd *rb, int x) { rb->buf[rb->wloc] = x; rb->wloc++; @@ -396,8 +367,7 @@ int buffi[BUFFSIZE]; int **buffs; -int makenodes(n) -int n; +int makenodes(int n) { int *p; int i; @@ -407,8 +377,7 @@ int n; return((int)p); } -int makeints(n) -int n; +int makeints(int n) { int *p; int i; @@ -419,13 +388,9 @@ int n; } /* - constant memory size: (i) one big malloc (ii) many mallocs, upper limit in doing mallocs - - - */ @@ -461,10 +426,7 @@ constant memory size: * */ /* -int newfreadbufs(buf,n,p) -short **buf; -int n; -ty_audiofile *p; +int newfreadbufs(short **buf, int n, ty_audiofile *p) { if (n*p->afsc > BUFFSIZE) { fprintf(stderr,"freadbufi: reading too many samples\n"); @@ -475,10 +437,7 @@ ty_audiofile *p; return(m); } -int newfreadbufi(buf,n,p) -int **buf; -int n; -ty_audiofile *p; +int newfreadbufi(int **buf, int n, ty_audiofile *p) { if (n*p->afsc > BUFFSIZE) { fprintf(stderr,"freadbufi: reading too many samples\n"); @@ -489,10 +448,7 @@ ty_audiofile *p; return(m); } -int newfreadbuff(buf,n,p) -float **buf; -int n; -ty_audiofile *p; +int newfreadbuff(float **buf, int n, ty_audiofile *p) { if (n*p->afsc > BUFFSIZE) { fprintf(stderr,"freadbufi: reading too many samples\n"); @@ -504,9 +460,7 @@ ty_audiofile *p; } -int newfreadbuf(buf,p) -ty_buffer *buf; -ty_audiofile *p; +int newfreadbuf(ty_buffer **buf, ty_audiofile *p) { } @@ -519,10 +473,7 @@ ty_audiofile *p; * Return value is the number of the samples read. */ -int freadbuf(buf,n,p) -int **buf; -int n; -ty_audiofile *p; +int freadbuf(int **buf, int n, ty_audiofile *p) { int h,i,j,k,l,s; unsigned int us; @@ -571,10 +522,7 @@ ty_audiofile *p; } -int fwritebuf(buf,n,p) -int **buf; -int n; -ty_audiofile *p; +int fwritebuf(int **buf, int n, ty_audiofile *p) { int h,i,j,k,l,s; unsigned int us1,us2; @@ -640,10 +588,7 @@ ty_audiofile *p; } -ty_audiofile *initaf(afm,afn,aft) -ty_afmethod *afm; -ty_afname *afn; -ty_aftype *aft; +ty_audiofile *initaf(ty_afmethod *afm, ty_afname *afn, ty_aftype *aft) { ty_audiofile *p; int i,j,k,n,s; @@ -769,8 +714,7 @@ void bye() } -ty_sample *makesample(sc) -int sc; +ty_sample *makesample(int sc) { ty_sample *p; @@ -780,10 +724,7 @@ int sc; } -int readsample(p,n,s) -ty_audiofile *p; -int n; -ty_sample *s; +int readsample(ty_audiofile *p, int n, ty_sample *s) { int i,j,k,dt,l; FILE *fp; @@ -839,10 +780,7 @@ ty_sample *s; } -int writesample(p,n,s) -ty_audiofile *p; -int n; -ty_sample *s; +int writesample(ty_audiofile *p, int n, ty_sample *s) { int i,j,k,dt,l; FILE *fp; @@ -878,8 +816,7 @@ ty_afmethod *afmethod_flowout() return(p); } -ty_afmethod *afmethod_rb(n) -int n; +ty_afmethod *afmethod_rb(int n) { ty_afmethod *p; @@ -902,8 +839,7 @@ ty_afmethod *afmethod_aimro() return(p); } -ty_afname *afname(s) -char *s; +ty_afname *afname(char *s) { ty_afname *p; @@ -936,8 +872,7 @@ ty_afname *afname_stdout() return(p); } -ty_aftype *aftype(sr,sc,stype) -int sr,sc,stype; +ty_aftype *aftype(int sr, int sc, int stype) { ty_aftype *p; @@ -954,8 +889,7 @@ ty_aftype *aftype_defstereo() } -ty_audiofile *initaf_aimdefstereo(filename) -char *filename; +ty_audiofile *initaf_aimdefstereo(char *filename) { return(initaf(afmethod_aimro(),afname(filename),aftype_defstereo())); } diff --git a/arts/modules/synth/c_filter_stuff.h b/arts/modules/synth/c_filter_stuff.h index 89e93de3..4f3d7f6a 100644 --- a/arts/modules/synth/c_filter_stuff.h +++ b/arts/modules/synth/c_filter_stuff.h @@ -40,16 +40,18 @@ typedef struct { double x,x1,x2,y,y1,y2; } filter; -void presence(); -void shelve(); +void presence(double cf, double boost, double bw, double *a0, + double *a1, double *a2, double *b1, double *b2); +void shelve(double cf, double boost, double *a0, double *a1, + double *a2, double *b1, double *b2); void initfilter(filter *f); -void setfilter_presence(); +void setfilter_presence(filter *f, double freq, double boost, double bw); void setfilter_shelve(filter *f, double freq, double boost); void setfilter_shelvelowpass(filter *f, double freq, double boost); -void setfilter_2polebp(); -void setfilter_peaknotch(); -void setfilter_peaknotch2(); -double applyfilter(); +void setfilter_2polebp(filter *f, double freq, double R); +void setfilter_peaknotch(filter *f, double freq, double M, double bw); +void setfilter_peaknotch2(filter *f, double freq, double gdb, double bw); +double applyfilter(filter *f, double x); #ifdef __cplusplus } @@ -208,38 +210,38 @@ typedef struct { ty_audiofile *gaf[C_MAXAUDIOFILES]; -int makenodes(); -int makeints(); +int makenodes(int n); +int makeints(int n); /* -int freadbuf(); -int fwritebuf(); +int freadbuf(int **buf, int n, ty_audiofile *p); +int fwritebuf(int **buf, int n, ty_audiofile *p); */ -ty_audiofile *initaf(); +ty_audiofile *initaf(ty_afmethod *afm, ty_afname *afn, ty_aftype *aft); void bye(); -ty_sample *makesample(); -int readsample(); -int writesample(); +ty_sample *makesample(int sc); +int readsample(ty_audiofile *p, int n, ty_sample *s); +int writesample(ty_audiofile *p, int n, ty_sample *s); ty_afmethod *afmethod_flowout(); -ty_afmethod *afmethod_rb(); +ty_afmethod *afmethod_rb(int n); ty_afmethod *afmethod_aimro(); -ty_afname *afname(); +ty_afname *afname(char *s); ty_afname *afname_stdin(); ty_afname *afname_stdout(); -ty_aftype *aftype(); +ty_aftype *aftype(int sr, int sc, int stype); ty_aftype *aftype_defstereo(); -ty_audiofile *initaf_aimdefstereo(); +ty_audiofile *initaf_aimdefstereo(char *filename); ty_audiofile *initaf_stdin(); void init(); -int saturate16(); -void initdelay(); -double readdelay(); -void writedelay(); -void initringbufferd(); -double readringbufferd(); -void writeringbufferd(); -void initringbufferi(); -int readringbufferi(); -void writeringbufferi(); +int saturate16(double x); +void initdelay(delay *d, int n); +double readdelay(delay *d); +void writedelay(delay *d, double x); +void initringbufferd(ringbufferd *rb, int n); +double readringbufferd(ringbufferd *rb, int n); +void writeringbufferd(ringbufferd *rb, double x); +void initringbufferi(ringbufferd *rb, int n); +int readringbufferi(ringbufferd *rb, int n); +void writeringbufferi(ringbufferd *rb, int x); #endif #endif // C_FILTER_STUFF_H diff --git a/arts/runtime/CMakeLists.txt b/arts/runtime/CMakeLists.txt index ac8692c4..c36e1e11 100644 --- a/arts/runtime/CMakeLists.txt +++ b/arts/runtime/CMakeLists.txt @@ -36,7 +36,7 @@ tde_add_library( artsbuilder SHARED compatibility.cpp localfactory_impl.cpp artsbuilderloader_impl.cpp VERSION 0.0.0 LINK - mcop artsflow artsflow_idl ${DL_LIBRARIES} ${ARTS_LIBRARIES} + mcop artsflow artsflow_idl ${CMAKE_DL_LIBS} ${ARTS_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/arts/runtime/moduleinfo.h b/arts/runtime/moduleinfo.h index 7c1ff15f..11232c8b 100644 --- a/arts/runtime/moduleinfo.h +++ b/arts/runtime/moduleinfo.h @@ -28,6 +28,6 @@ #include "artsbuilder.h" #include <tdelibs_export.h> -KDE_EXPORT Arts::ModuleInfo makeModuleInfo(const std::string& name); +TDE_EXPORT Arts::ModuleInfo makeModuleInfo(const std::string& name); #endif /* MODULEINFO_H */ diff --git a/arts/runtime/sequenceutils.h b/arts/runtime/sequenceutils.h index f156b8b7..bcae858d 100644 --- a/arts/runtime/sequenceutils.h +++ b/arts/runtime/sequenceutils.h @@ -26,16 +26,16 @@ #include <string> #include <tdelibs_export.h> -KDE_EXPORT int parse_line(const char *in, char *& cmd, char *& param); +TDE_EXPORT int parse_line(const char *in, char *& cmd, char *& param); -KDE_EXPORT void sqprintf(std::vector<std::string> *list, const char *fmt, ...) +TDE_EXPORT void sqprintf(std::vector<std::string> *list, const char *fmt, ...) #ifdef __GNUC__ __attribute__ (( format (printf, 2, 3))) #endif ; -KDE_EXPORT void addSubStringSeq(std::vector<std::string> *target, const std::vector<std::string> *source); -KDE_EXPORT void appendStringSeq(std::vector<std::string> *target, const std::vector<std::string> *source); -KDE_EXPORT int parse_line(const std::string& in, std::string& cmd, std::string& param); -KDE_EXPORT std::vector<std::string> *getSubStringSeq(const std::vector<std::string> *seq,unsigned long& i); +TDE_EXPORT void addSubStringSeq(std::vector<std::string> *target, const std::vector<std::string> *source); +TDE_EXPORT void appendStringSeq(std::vector<std::string> *target, const std::vector<std::string> *source); +TDE_EXPORT int parse_line(const std::string& in, std::string& cmd, std::string& param); +TDE_EXPORT std::vector<std::string> *getSubStringSeq(const std::vector<std::string> *seq,unsigned long& i); #endif /* ARTS_SEQUENCEUTILS_H */ diff --git a/arts/tools/artsactions.cpp b/arts/tools/artsactions.cpp index d5c5f071..226c0bad 100644 --- a/arts/tools/artsactions.cpp +++ b/arts/tools/artsactions.cpp @@ -62,52 +62,52 @@ ArtsActions::~ArtsActions() { } TDEAction* ArtsActions::actionScopeView() { - if ( !_a_sv ) _a_sv = new TDEAction( i18n( "&FFT Scope" ), "artsfftscope", TDEShortcut(), this, TQT_SLOT( viewScopeView() ), _actioncollection, "artssupport_view_scopeview" ); + if ( !_a_sv ) _a_sv = new TDEAction( i18n( "&FFT Scope" ), "artsfftscope", TDEShortcut(), this, TQ_SLOT( viewScopeView() ), _actioncollection, "artssupport_view_scopeview" ); return _a_sv; } TDEAction* ArtsActions::actionAudioManager() { - if ( !_a_am ) _a_am = new TDEAction( i18n( "&Audio Manager" ), "artsaudiomanager", TDEShortcut(), this, TQT_SLOT( viewAudioManager() ), _actioncollection, "artssupport_view_audiomanager" ); + if ( !_a_am ) _a_am = new TDEAction( i18n( "&Audio Manager" ), "artsaudiomanager", TDEShortcut(), this, TQ_SLOT( viewAudioManager() ), _actioncollection, "artssupport_view_audiomanager" ); return _a_am; } TDEAction* ArtsActions::actionArtsStatusView() { - if ( !_a_asv ) _a_asv = new TDEAction( i18n( "aRts &Status" ), "artscontrol", TDEShortcut(), this, TQT_SLOT( viewArtsStatusView() ), _actioncollection, "artssupport_view_artsstatus" ); + if ( !_a_asv ) _a_asv = new TDEAction( i18n( "aRts &Status" ), "artscontrol", TDEShortcut(), this, TQ_SLOT( viewArtsStatusView() ), _actioncollection, "artssupport_view_artsstatus" ); return _a_asv; } TDEAction* ArtsActions::actionMidiManagerView() { - if ( !_a_mmv ) _a_mmv = new TDEAction( i18n( "&MIDI Manager" ), "artsmidimanager", TDEShortcut(), this, TQT_SLOT( viewMidiManagerView() ), _actioncollection, "artssupport_view_midimanager" ); + if ( !_a_mmv ) _a_mmv = new TDEAction( i18n( "&MIDI Manager" ), "artsmidimanager", TDEShortcut(), this, TQ_SLOT( viewMidiManagerView() ), _actioncollection, "artssupport_view_midimanager" ); return _a_mmv; } TDEAction* ArtsActions::actionEnvironmentView() { - if ( !_a_ev ) _a_ev = new TDEAction( i18n( "&Environment" ), "artsenvironment", TDEShortcut(), this, TQT_SLOT( viewEnvironmentView() ), _actioncollection, "artssupport_view_environment" ); + if ( !_a_ev ) _a_ev = new TDEAction( i18n( "&Environment" ), "artsenvironment", TDEShortcut(), this, TQ_SLOT( viewEnvironmentView() ), _actioncollection, "artssupport_view_environment" ); return _a_ev; } TDEAction* ArtsActions::actionMediaTypesView() { - if ( !_a_mtv ) _a_mtv = new TDEAction( i18n( "Available Media &Types" ), "artsmediatypes", TDEShortcut(), this, TQT_SLOT( viewMediaTypesView() ), _actioncollection, "artssupport_view_mediatypes" ); + if ( !_a_mtv ) _a_mtv = new TDEAction( i18n( "Available Media &Types" ), "artsmediatypes", TDEShortcut(), this, TQ_SLOT( viewMediaTypesView() ), _actioncollection, "artssupport_view_mediatypes" ); return _a_mtv; } TDEAction* ArtsActions::actionStyleNormal() { - if ( !_a_style_normal ) _a_style_normal = new TDEAction( i18n( "Style: NormalBars" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_normal() ), _actioncollection, "artssupport_style_normal" ); + if ( !_a_style_normal ) _a_style_normal = new TDEAction( i18n( "Style: NormalBars" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_normal() ), _actioncollection, "artssupport_style_normal" ); return _a_style_normal; } TDEAction* ArtsActions::actionStyleFire() { - if ( !_a_style_fire ) _a_style_fire = new TDEAction( i18n( "Style: FireBars" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_fire() ), _actioncollection, "artssupport_style_fire" ); + if ( !_a_style_fire ) _a_style_fire = new TDEAction( i18n( "Style: FireBars" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_fire() ), _actioncollection, "artssupport_style_fire" ); return _a_style_fire; } TDEAction* ArtsActions::actionStyleLine() { - if ( !_a_style_line ) _a_style_line = new TDEAction( i18n( "Style: LineBars" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_line() ), _actioncollection, "artssupport_style_line" ); + if ( !_a_style_line ) _a_style_line = new TDEAction( i18n( "Style: LineBars" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_line() ), _actioncollection, "artssupport_style_line" ); return _a_style_line; } TDEAction* ArtsActions::actionStyleLED() { - if ( !_a_style_led ) _a_style_led = new TDEAction( i18n( "Style: LEDs" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_led() ), _actioncollection, "artssupport_style_led" ); + if ( !_a_style_led ) _a_style_led = new TDEAction( i18n( "Style: LEDs" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_led() ), _actioncollection, "artssupport_style_led" ); return _a_style_led; } TDEAction* ArtsActions::actionStyleAnalog() { - if ( !_a_style_analog ) _a_style_analog = new TDEAction( i18n( "Style: Analog" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_analog() ), _actioncollection, "artssupport_style_analog" ); + if ( !_a_style_analog ) _a_style_analog = new TDEAction( i18n( "Style: Analog" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_analog() ), _actioncollection, "artssupport_style_analog" ); return _a_style_analog; } TDEAction* ArtsActions::actionStyleSmall() { - if ( !_a_style_small ) _a_style_small = new TDEAction( i18n( "Style: Small" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_small() ), _actioncollection, "artssupport_style_small" ); + if ( !_a_style_small ) _a_style_small = new TDEAction( i18n( "Style: Small" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_small() ), _actioncollection, "artssupport_style_small" ); return _a_style_small; } TDEPopupMenu* ArtsActions::stylemenu() { @@ -136,7 +136,7 @@ TDEAction* ArtsActions::actionLessBars( const TQObject* receiver, const char* sl void ArtsActions::viewScopeView() { if ( !_sv ) { _sv = new FFTScopeView( _kartsserver->server() ); - connect( _sv, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewScopeView() ) ); + connect( _sv, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewScopeView() ) ); } else { delete _sv; _sv = 0; @@ -145,7 +145,7 @@ void ArtsActions::viewScopeView() { void ArtsActions::viewAudioManager() { if ( !_am ) { _am = new Gui_AUDIO_MANAGER(); - connect( _am, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewAudioManager() ) ); + connect( _am, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewAudioManager() ) ); } else { delete _am; _am = 0; @@ -154,7 +154,7 @@ void ArtsActions::viewAudioManager() { void ArtsActions::viewArtsStatusView() { if ( !_asv ) { _asv = new ArtsStatusView( _kartsserver->server() ); - connect( _asv, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewArtsStatusView() ) ); + connect( _asv, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewArtsStatusView() ) ); } else { delete _asv; _asv = 0; @@ -163,7 +163,7 @@ void ArtsActions::viewArtsStatusView() { void ArtsActions::viewMidiManagerView() { if ( !_mmv ) { _mmv = new MidiManagerView(); - connect( _mmv, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewMidiManagerView() ) ); + connect( _mmv, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewMidiManagerView() ) ); } else { delete _mmv; _mmv = 0; @@ -172,7 +172,7 @@ void ArtsActions::viewMidiManagerView() { void ArtsActions::viewEnvironmentView() { if ( !_ev ) { _ev = new EnvironmentView( defaultEnvironment() ); - connect( _ev, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewEnvironmentView() ) ); + connect( _ev, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewEnvironmentView() ) ); } else { delete _ev; _ev = 0; @@ -181,7 +181,7 @@ void ArtsActions::viewEnvironmentView() { void ArtsActions::viewMediaTypesView() { if ( !_mtv ) { _mtv = new MediaTypesView(); - connect( _mtv, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewMediaTypesView() ) ); + connect( _mtv, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewMediaTypesView() ) ); } else { delete _mtv; _mtv = 0; diff --git a/arts/tools/artsactions.h b/arts/tools/artsactions.h index 5bba632d..f542fb9b 100644 --- a/arts/tools/artsactions.h +++ b/arts/tools/artsactions.h @@ -34,7 +34,7 @@ class MidiManagerView; class EnvironmentView; class MediaTypesView; -class KDE_EXPORT ArtsActions : public TQObject +class TDE_EXPORT ArtsActions : public TQObject { TQ_OBJECT diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp index a70b8683..6b9b92fd 100644 --- a/arts/tools/artscontrolapplet.cpp +++ b/arts/tools/artscontrolapplet.cpp @@ -29,7 +29,7 @@ extern "C" { - KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile) + TDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile) { TDEGlobal::locale()->insertCatalogue("artscontrol"); return new ArtsControlApplet(configFile, KPanelApplet::Normal, @@ -61,7 +61,7 @@ ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int p->layout->activate(); - TQTimer::singleShot( 100, this, TQT_SLOT( supdatelayout() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( supdatelayout() ) ); kdDebug()<<"ArtsControlApplet::ArtsControlApplet() finished."<<endl; } @@ -139,7 +139,7 @@ kdDebug() << k_funcinfo << endl; if ( !svinline ) { svinline = new FFTScopeView( arts->server(), _parent ); svinline->setMargin( 2 ); svinline->setLineWidth( 2 ); svinline->setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); - connect( svinline, TQT_SIGNAL( closed() ), this, TQT_SLOT( SVinline() ) ); + connect( svinline, TQ_SIGNAL( closed() ), this, TQ_SLOT( SVinline() ) ); layout->addWidget( svinline ); } else { delete svinline; diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h index 54928a84..05b6ee2d 100644 --- a/arts/tools/artscontrolapplet_private.h +++ b/arts/tools/artscontrolapplet_private.h @@ -45,7 +45,7 @@ class VolumeSlider; -class KDE_EXPORT ArtsControlAppletPrivate : public TQObject { +class TDE_EXPORT ArtsControlAppletPrivate : public TQObject { TQ_OBJECT private: @@ -83,7 +83,7 @@ public: menu = new TDEPopupMenu( 0 ); _showSV = _artsactions->actionScopeView(); _showSV->plug( menu ); - _showSVinline = new TDEAction( i18n( "Toggle &Inline FFT Scope" ), "artscontrol", TDEShortcut(), this, TQT_SLOT( SVinline() ), this ); + _showSVinline = new TDEAction( i18n( "Toggle &Inline FFT Scope" ), "artscontrol", TDEShortcut(), this, TQ_SLOT( SVinline() ), this ); _showSVinline->plug( menu ); _showAM = _artsactions->actionAudioManager(); _showAM->plug( menu ); @@ -97,12 +97,12 @@ public: _showMediaTypes->plug( menu ); menu->insertSeparator(); menu->insertItem( i18n( "VU-Style" ), _artsactions->stylemenu() ); - connect( _artsactions, TQT_SIGNAL( styleNormal() ), this, TQT_SLOT( styleNormalBars() ) ); - connect( _artsactions, TQT_SIGNAL( styleFire() ), this, TQT_SLOT( styleFireBars() ) ); - connect( _artsactions, TQT_SIGNAL( styleLine() ), this, TQT_SLOT( styleLineBars() ) ); - connect( _artsactions, TQT_SIGNAL( styleLED() ), this, TQT_SLOT( styleLEDs() ) ); - connect( _artsactions, TQT_SIGNAL( styleAnalog() ), this, TQT_SLOT( styleAnalog() ) ); - connect( _artsactions, TQT_SIGNAL( styleSmall() ), this, TQT_SLOT( styleSmall() ) ); + connect( _artsactions, TQ_SIGNAL( styleNormal() ), this, TQ_SLOT( styleNormalBars() ) ); + connect( _artsactions, TQ_SIGNAL( styleFire() ), this, TQ_SLOT( styleFireBars() ) ); + connect( _artsactions, TQ_SIGNAL( styleLine() ), this, TQ_SLOT( styleLineBars() ) ); + connect( _artsactions, TQ_SIGNAL( styleLED() ), this, TQ_SLOT( styleLEDs() ) ); + connect( _artsactions, TQ_SIGNAL( styleAnalog() ), this, TQ_SLOT( styleAnalog() ) ); + connect( _artsactions, TQ_SIGNAL( styleSmall() ), this, TQ_SLOT( styleSmall() ) ); } ~ArtsControlAppletPrivate() { if ( svinline ) SVinline(); diff --git a/arts/tools/audiomanager.cpp b/arts/tools/audiomanager.cpp index e8858954..10f901ee 100644 --- a/arts/tools/audiomanager.cpp +++ b/arts/tools/audiomanager.cpp @@ -55,7 +55,7 @@ Gui_AUDIO_MANAGER::Gui_AUDIO_MANAGER( TQWidget* parent, const char* name ) : Tem TQTimer *updatetimer = new TQTimer(this); updatetimer->start(500); - TQObject::connect(updatetimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(tick())); + TQObject::connect(updatetimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(tick())); } Gui_AUDIO_MANAGER::~Gui_AUDIO_MANAGER() @@ -103,8 +103,8 @@ void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*layout*/) listview->setMinimumSize(300,100); - TQObject::connect(listview,TQT_SIGNAL(executed(TQListViewItem *)),proxy, - TQT_SLOT(edit(TQListViewItem *))); + TQObject::connect(listview,TQ_SIGNAL(executed(TQListViewItem *)),proxy, + TQ_SLOT(edit(TQListViewItem *))); mainlayout->addWidget(listview); diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp index 62ba74be..19f3beb3 100644 --- a/arts/tools/choosebusdlg.cpp +++ b/arts/tools/choosebusdlg.cpp @@ -43,7 +43,7 @@ static void min_size(TQWidget *w) { } ChooseBusDlg::ChooseBusDlg(TQWidget *parent) - : KDialog(parent,"X", TRUE) + : KDialog(parent,"X", true) , _newbusitemindex( -1 ) { setCaption(i18n("Choose Bus")); @@ -105,7 +105,7 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent) TQLabel * newbuslabel = new TQLabel( i18n( "New bus:" ), this ); layout2->addWidget( newbuslabel ); lineedit = new KLineEdit( this ); - connect( lineedit, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( textChanged( const TQString & ) ) ); + connect( lineedit, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( textChanged( const TQString & ) ) ); layout2->addWidget( lineedit ); // hruler @@ -126,15 +126,15 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent) buttonlayout->addSpacing(5); KButtonBox *bbox = new KButtonBox(this); - bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() )); + bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() )); bbox->addStretch(1); TQPushButton * okbutton = bbox->addButton(KStdGuiItem::ok()); okbutton->setDefault( true ); - connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) ); + connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) ); TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel()); - connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) ); + connect( cancelbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(reject() ) ); bbox->layout(); @@ -155,7 +155,7 @@ TQString ChooseBusDlg::result() void ChooseBusDlg::help() { - TDEApplication::kApplication()->invokeHelp("", "artsbuilder"); + tdeApp->invokeHelp("", "artsbuilder"); } void ChooseBusDlg::textChanged( const TQString & busname ) diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp index aca373e9..1e223629 100644 --- a/arts/tools/environmentview.cpp +++ b/arts/tools/environmentview.cpp @@ -71,25 +71,25 @@ EnvironmentView::EnvironmentView( Container container, TQWidget* parent, const c defaultEnvFileName.replace('~', TQDir::homeDirPath()); listBox = new TDEListBox(this); update(); - connect(listBox,TQT_SIGNAL(executed(TQListBoxItem*)), - this,TQT_SLOT(view(TQListBoxItem*))); + connect(listBox,TQ_SIGNAL(executed(TQListBoxItem*)), + this,TQ_SLOT(view(TQListBoxItem*))); TQPushButton *mixerButton = new TQPushButton(i18n("Add Mixer"), this); - connect(mixerButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addMixer())); + connect(mixerButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addMixer())); TQPushButton *effectRackButton = new TQPushButton(i18n("Add Effect Rack"), this); - connect(effectRackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addEffectRack())); + connect(effectRackButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addEffectRack())); TQPushButton *delButton = new TQPushButton(i18n("Delete Item"), this); - connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(delItem())); + connect(delButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(delItem())); TQPushButton *loadButton = new TQPushButton(i18n("Load %1").arg(DEFAULT_ENV_FILENAME), this); - connect(loadButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(load())); + connect(loadButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(load())); TQPushButton *saveButton = new TQPushButton(i18n("Save %1").arg(DEFAULT_ENV_FILENAME), this); - connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(save())); + connect(saveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(save())); show(); } diff --git a/arts/tools/fftscopeview.cpp b/arts/tools/fftscopeview.cpp index 35805877..5d0a8672 100644 --- a/arts/tools/fftscopeview.cpp +++ b/arts/tools/fftscopeview.cpp @@ -60,7 +60,7 @@ kdDebug()<<k_funcinfo<<endl; updateScopeData(); TQBoxLayout * l = new TQHBoxLayout( this ); - l->setAutoAdd( TRUE ); + l->setAutoAdd( true ); for ( unsigned int i=0;i<scopeData->size();i++ ) { @@ -77,23 +77,23 @@ kdDebug()<<k_funcinfo<<endl; updatetimer = new TQTimer( this ); updatetimer->start( 100 ); - connect( updatetimer,TQT_SIGNAL( timeout() ),this,TQT_SLOT( updateScope() ) ); + connect( updatetimer,TQ_SIGNAL( timeout() ),this,TQ_SLOT( updateScope() ) ); _artsactions = new ArtsActions( 0, 0, this ); - _moreBars = ArtsActions::actionMoreBars( TQT_TQOBJECT(this), TQT_SLOT( moreBars() ), 0 ); - _lessBars = ArtsActions::actionLessBars( TQT_TQOBJECT(this), TQT_SLOT( lessBars() ), 0 ); + _moreBars = ArtsActions::actionMoreBars( this, TQ_SLOT( moreBars() ), 0 ); + _lessBars = ArtsActions::actionLessBars( this, TQ_SLOT( lessBars() ), 0 ); _menu = new TDEPopupMenu( 0 ); _moreBars->plug( _menu ); _lessBars->plug( _menu ); - _substyle = new TDEAction( i18n( "Substyle" ), "", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( substyle() ), TQT_TQOBJECT(this) ); + _substyle = new TDEAction( i18n( "Substyle" ), "", TDEShortcut(), this, TQ_SLOT( substyle() ), this ); _substyle->plug( _menu ); _menu->insertItem( i18n("VU-Style"), _artsactions->stylemenu() ); - connect( _artsactions, TQT_SIGNAL( styleNormal() ), this, TQT_SLOT( styleNormalBars() ) ); - connect( _artsactions, TQT_SIGNAL( styleFire() ), this, TQT_SLOT( styleFireBars() ) ); - connect( _artsactions, TQT_SIGNAL( styleLine() ), this, TQT_SLOT( styleLineBars() ) ); - connect( _artsactions, TQT_SIGNAL( styleLED() ), this, TQT_SLOT( styleLEDs() ) ); - connect( _artsactions, TQT_SIGNAL( styleAnalog() ), this, TQT_SLOT( styleAnalog() ) ); - connect( _artsactions, TQT_SIGNAL( styleSmall() ), this, TQT_SLOT( styleSmall() ) ); + connect( _artsactions, TQ_SIGNAL( styleNormal() ), this, TQ_SLOT( styleNormalBars() ) ); + connect( _artsactions, TQ_SIGNAL( styleFire() ), this, TQ_SLOT( styleFireBars() ) ); + connect( _artsactions, TQ_SIGNAL( styleLine() ), this, TQ_SLOT( styleLineBars() ) ); + connect( _artsactions, TQ_SIGNAL( styleLED() ), this, TQ_SLOT( styleLEDs() ) ); + connect( _artsactions, TQ_SIGNAL( styleAnalog() ), this, TQ_SLOT( styleAnalog() ) ); + connect( _artsactions, TQ_SIGNAL( styleSmall() ), this, TQ_SLOT( styleSmall() ) ); } FFTScopeView::~FFTScopeView() { diff --git a/arts/tools/fftscopeview.h b/arts/tools/fftscopeview.h index 0a0a93cb..91a27378 100644 --- a/arts/tools/fftscopeview.h +++ b/arts/tools/fftscopeview.h @@ -38,7 +38,7 @@ class TDEAction; class KArtsWidget; class ArtsActions; -class KDE_EXPORT FFTScopeView : public Template_ArtsView { +class TDE_EXPORT FFTScopeView : public Template_ArtsView { TQ_OBJECT protected: diff --git a/arts/tools/levelmeters.cpp b/arts/tools/levelmeters.cpp index 1d0b080c..fc8066e0 100644 --- a/arts/tools/levelmeters.cpp +++ b/arts/tools/levelmeters.cpp @@ -17,7 +17,7 @@ PeakBar::PeakBar(TQWidget *parent) horizontalMode= false; currentValue= 0.0f; - lastValues.setAutoDelete( TRUE ); + lastValues.setAutoDelete( true ); setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); @@ -190,7 +190,7 @@ void ScaleView::drawContents(TQPainter *p) { LedMeter::LedMeter(TQWidget *parent, bool blueState) : ACLevelMeter(parent) { setBackgroundColor(black); TQBoxLayout * l = new TQVBoxLayout( this ); - l->setAutoAdd(TRUE); + l->setAutoAdd(true); for(int i=0;i<12;i++) { TQColor c; if(blueState) @@ -204,7 +204,7 @@ LedMeter::LedMeter(TQWidget *parent, bool blueState) : ACLevelMeter(parent) { // put each led in its own frame, since it seems to be broken TQFrame *lframe = new TQFrame(this); TQBoxLayout *lfl = new TQVBoxLayout( lframe ); - lfl->setAutoAdd(TRUE); + lfl->setAutoAdd(true); leds[i] = new KLed(c,KLed::Off, KLed::Sunken, KLed::Circular,lframe); } diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp index b651c625..74a9ed6f 100644 --- a/arts/tools/main.cpp +++ b/arts/tools/main.cpp @@ -87,7 +87,7 @@ VControl::VControl( KArtsServer* artsserver, TQWidget *parent) : TQFrame(parent) , server( artsserver ) { - connect( server, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( initaRtsConnections() ) ); + connect( server, TQ_SIGNAL( restartedServer() ), this, TQ_SLOT( initaRtsConnections() ) ); /* if(server.isNull()) { KMessageBox::error( 0, i18n("Connection to the soundserver failed - make sure that artsd is really running and that your tdelibs version is not older than tdemultimedia.")); @@ -136,7 +136,7 @@ void VControl::useOldVolumeBar(int old) { void VControl::showFreeVerbView() { if(!freeVerbView) { freeVerbView = new FreeVerbView(server->server()); - connect(freeVerbView,TQT_SIGNAL(closed()),this,TQT_SLOT(showFreeVerbView())); + connect(freeVerbView,TQ_SIGNAL(closed()),this,TQ_SLOT(showFreeVerbView())); } else { delete freeVerbView; freeVerbView = 0; @@ -158,9 +158,9 @@ void MainWindow::toggleVolumeBar() { vc->useOldVolumeBar(showOldVolumeDisplay->isChecked()); } -MainWindow::MainWindow() : TDEMainWindow(0), kartsserver( new KArtsServer( TQT_TQOBJECT(this) ) ) { +MainWindow::MainWindow() : TDEMainWindow(0), kartsserver( new KArtsServer( this ) ) { kdDebug() << k_funcinfo << endl; - connect( kartsserver, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( serverRestarted() ) ); + connect( kartsserver, TQ_SIGNAL( restartedServer() ), this, TQ_SLOT( serverRestarted() ) ); vc = new VControl( kartsserver, this ); setCentralWidget( vc ); @@ -172,11 +172,11 @@ kdDebug() << k_funcinfo << endl; ( void ) artsactions->actionMidiManagerView(); ( void ) artsactions->actionEnvironmentView(); ( void ) artsactions->actionMediaTypesView(); - ( void ) new TDEAction( i18n("Toggle Free&Verb"), 0, TQT_TQOBJECT(vc), TQT_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" ); + ( void ) new TDEAction( i18n("Toggle Free&Verb"), 0, vc, TQ_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" ); showOldVolumeDisplay= - new TDEToggleAction( i18n( "Old aRts-Control-Style for VU-Meter" /*"&LED-Style Volume Display"*/ ), 0, TQT_TQOBJECT(this), - TQT_SLOT( toggleVolumeBar() ), actionCollection(), "old_volume_display" ); - ( void ) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit_artscontrol" ); + new TDEToggleAction( i18n( "Old aRts-Control-Style for VU-Meter" /*"&LED-Style Volume Display"*/ ), 0, this, + TQ_SLOT( toggleVolumeBar() ), actionCollection(), "old_volume_display" ); + ( void ) KStdAction::quit( this, TQ_SLOT( close() ), actionCollection(), "quit_artscontrol" ); createGUI("artscontrol.rc"); resize(20,300); diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp index 6d155b06..cb920bdf 100644 --- a/arts/tools/midiinstdlg.cpp +++ b/arts/tools/midiinstdlg.cpp @@ -21,7 +21,7 @@ #include "midiinstdlg.h" #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tqlayout.h> @@ -64,7 +64,7 @@ static TQStringList listFiles(TQString directory, TQString extension) } MidiInstDlg::MidiInstDlg(TQWidget *parent) - :TQDialog(parent,"instrument",TRUE) + :TQDialog(parent,"instrument",true) { TQVBoxLayout *mainlayout = new TQVBoxLayout(this); @@ -135,11 +135,11 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent) buttonlayout->addSpacing(5); KButtonBox *bbox = new KButtonBox(this); - bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() )); + bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() )); bbox->addStretch(1); TQButton *okbutton = bbox->addButton(KStdGuiItem::ok()); - connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) ); + connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) ); bbox->layout(); @@ -173,7 +173,7 @@ TQCString MidiInstDlg::filename() void MidiInstDlg::help() { - TDEApplication::kApplication()->invokeHelp("", "artsbuilder"); + tdeApp->invokeHelp("", "artsbuilder"); } #include "midiinstdlg.moc" diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp index b32c09f2..4e92c000 100644 --- a/arts/tools/midimanagerview.cpp +++ b/arts/tools/midimanagerview.cpp @@ -115,21 +115,21 @@ MidiManagerView::MidiManagerView() { TQTimer *updatetimer = new TQTimer(this); updatetimer->start(5000); - connect(updatetimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(updateLists())); + connect(updatetimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(updateLists())); widget = new MidiManagerWidget(this); setCentralWidget(widget); setCaption(i18n("MIDI Manager")); setIcon( MainBarIcon( "artsfftscope", 32 ) ); - (void)new TDEAction(i18n("&System MIDI Port (OSS)"), 0, TQT_TQOBJECT(this), TQT_SLOT(addOSSMidiPort()), + (void)new TDEAction(i18n("&System MIDI Port (OSS)"), 0, this, TQ_SLOT(addOSSMidiPort()), actionCollection(), "add_oss_midi_port"); - (void)new TDEAction(i18n("&aRts Synthesis MIDI Output"), 0, TQT_TQOBJECT(this), - TQT_SLOT(addArtsMidiOutput()), actionCollection(), "add_arts_midi_output"); + (void)new TDEAction(i18n("&aRts Synthesis MIDI Output"), 0, this, + TQ_SLOT(addArtsMidiOutput()), actionCollection(), "add_arts_midi_output"); - (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - connect(widget->connectButton,TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotConnect())); - connect(widget->disconnectButton,TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotDisconnect())); + (void) KStdAction::quit( this, TQ_SLOT(close()), actionCollection()); + connect(widget->connectButton,TQ_SIGNAL(clicked()), this, TQ_SLOT(slotConnect())); + connect(widget->disconnectButton,TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDisconnect())); connectionWidget = new ConnectionWidget(this, widget->connectionFrame); connectionWidget->setMinimumSize(60,10); diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp index 1273bf58..f2340ab5 100644 --- a/arts/tools/midiportdlg.cpp +++ b/arts/tools/midiportdlg.cpp @@ -32,7 +32,7 @@ #include <tqpushbutton.h> #include <kstdguiitem.h> -MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *title) :TQDialog(parent,title,TRUE) +MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *title) :TQDialog(parent,title,true) { TQVBoxLayout *mainlayout = new TQVBoxLayout(this); @@ -80,13 +80,13 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *titl buttonlayout->addSpacing(5); KButtonBox *bbox = new KButtonBox(this); - TQPushButton *helpbutton = bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() )); + TQPushButton *helpbutton = bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() )); bbox->addStretch(1); helpbutton->setAutoDefault( true ); helpbutton->setDefault( true ); TQPushButton *okbutton = bbox->addButton(KStdGuiItem::ok()); - connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) ); + connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) ); okbutton->setAutoDefault( true ); okbutton->setDefault( true ); @@ -105,7 +105,7 @@ const char *MidiPortDlg::device() void MidiPortDlg::help() { - TDEApplication::kApplication()->invokeHelp("", "artsbuilder"); + tdeApp->invokeHelp("", "artsbuilder"); } #include "midiportdlg.moc" diff --git a/arts/tools/statusview.cpp b/arts/tools/statusview.cpp index 197d620d..5c1290ba 100644 --- a/arts/tools/statusview.cpp +++ b/arts/tools/statusview.cpp @@ -39,7 +39,7 @@ ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* parent, con { this->setCaption( i18n( "aRts Status" ) ); TQBoxLayout *l= new TQVBoxLayout(this); - //l->setAutoAdd(TRUE); + //l->setAutoAdd(true); RealtimeStatus rs= server.realtimeStatus(); l->addWidget(new TQLabel(rs==rtRealtime? @@ -63,10 +63,10 @@ ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* parent, con suspendButton= new TQPushButton(this, "suspendButton"); suspendButton->setText(i18n("&Suspend Now")); l->addWidget(suspendButton); - connect(suspendButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(suspendButtonClicked())); + connect(suspendButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(suspendButtonClicked())); artsPollStatusTimer= new TQTimer(this); - connect(artsPollStatusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateStatus())); + connect(artsPollStatusTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateStatus())); artsPollStatusTimer->start(1000); //l->activate(); show(); diff --git a/doc/kscd/index.docbook b/doc/kscd/index.docbook index b724ac6d..d36645af 100644 --- a/doc/kscd/index.docbook +++ b/doc/kscd/index.docbook @@ -128,7 +128,6 @@ support)</para></listitem> <listitem><para>&SGI; Irix (including <abbrev>cdda</abbrev> support)</para></listitem> <listitem><para>Sony NEWS</para></listitem> -<listitem><para>OSF/1</para></listitem> <listitem><para>Ultrix</para></listitem> </itemizedlist> diff --git a/doc/man/juk/CMakeLists.txt b/doc/man/juk/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/juk/CMakeLists.txt +++ b/doc/man/juk/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kaboodle/CMakeLists.txt b/doc/man/kaboodle/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kaboodle/CMakeLists.txt +++ b/doc/man/kaboodle/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kaudiocreator/CMakeLists.txt b/doc/man/kaudiocreator/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kaudiocreator/CMakeLists.txt +++ b/doc/man/kaudiocreator/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kmix/CMakeLists.txt b/doc/man/kmix/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kmix/CMakeLists.txt +++ b/doc/man/kmix/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/krec/CMakeLists.txt b/doc/man/krec/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/krec/CMakeLists.txt +++ b/doc/man/krec/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/noatun/CMakeLists.txt b/doc/man/noatun/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/noatun/CMakeLists.txt +++ b/doc/man/noatun/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/juk/HACKING b/juk/HACKING index 4d9f7781..2fb4d392 100644 --- a/juk/HACKING +++ b/juk/HACKING @@ -103,15 +103,15 @@ be inline in the headers. The organization of the members in a class should be roughly as follows: public: -public Q_SLOTS: +public slots: protected: -protected Q_SLOTS: -Q_SIGNALS: +protected slots: +signals: private: // member funtions -private Q_SLOTS: +private slots: private: // member variables -If there are no private Q_SLOTS there is no need for two private sections, however +If there are no private slots there is no need for two private sections, however private functions and private variables should be clearly separated. The implementations files -- .cpp files -- should follow (when possible) the diff --git a/juk/advancedsearchdialog.cpp b/juk/advancedsearchdialog.cpp index 8fc4c037..386e12e3 100644 --- a/juk/advancedsearchdialog.cpp +++ b/juk/advancedsearchdialog.cpp @@ -82,17 +82,17 @@ AdvancedSearchDialog::AdvancedSearchDialog(const TQString &defaultName, TQBoxLayout *l = new TQHBoxLayout(buttons, 0, 5); KPushButton *clearButton = new KPushButton(KStdGuiItem::clear(), buttons); - connect(clearButton, TQT_SIGNAL(clicked()), TQT_SLOT(clear())); + connect(clearButton, TQ_SIGNAL(clicked()), TQ_SLOT(clear())); l->addWidget(clearButton); l->addStretch(1); m_moreButton = new KPushButton(i18n("More"), buttons); - connect(m_moreButton, TQT_SIGNAL(clicked()), TQT_SLOT(more())); + connect(m_moreButton, TQ_SIGNAL(clicked()), TQ_SLOT(more())); l->addWidget(m_moreButton); m_fewerButton = new KPushButton(i18n("Fewer"), buttons); - connect(m_fewerButton, TQT_SIGNAL(clicked()), TQT_SLOT(fewer())); + connect(m_fewerButton, TQ_SIGNAL(clicked()), TQ_SLOT(fewer())); l->addWidget(m_fewerButton); m_playlistNameLineEdit->setFocus(); diff --git a/juk/akodeplayer.h b/juk/akodeplayer.h index 8805f786..009afb2d 100644 --- a/juk/akodeplayer.h +++ b/juk/akodeplayer.h @@ -27,14 +27,14 @@ #include <tqstring.h> #include "player.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace aKode { class File; class Player; } -class KDE_EXPORT aKodePlayer : public Player +class TDE_EXPORT aKodePlayer : public Player { TQ_OBJECT diff --git a/juk/artsplayer.cpp b/juk/artsplayer.cpp index 2bcf43ca..a20b4674 100644 --- a/juk/artsplayer.cpp +++ b/juk/artsplayer.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqdir.h> @@ -84,7 +84,7 @@ void ArtsPlayer::play(const FileHandle &file) m_playobject = m_factory->createPlayObject(m_currentURL, false); if(m_playobject->object().isNull()) - connect(m_playobject, TQT_SIGNAL(playObjectCreated()), TQT_SLOT(playObjectCreated())); + connect(m_playobject, TQ_SIGNAL(playObjectCreated()), TQ_SLOT(playObjectCreated())); else playObjectCreated(); } @@ -251,7 +251,7 @@ void ArtsPlayer::setupPlayer() m_dispatcher = new KArtsDispatcher; m_server = new KArtsServer; setupArtsObjects(); - connect(m_server, TQT_SIGNAL(restartedServer()), TQT_SLOT(setupArtsObjects())); + connect(m_server, TQ_SIGNAL(restartedServer()), TQ_SLOT(setupArtsObjects())); } void ArtsPlayer::setupVolumeControl() diff --git a/juk/cache.cpp b/juk/cache.cpp index 58062036..fc12625e 100644 --- a/juk/cache.cpp +++ b/juk/cache.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdeconfig.h> #include <tdelocale.h> @@ -275,7 +275,7 @@ void Cache::load() if(!f.open(IO_ReadOnly)) return; - CacheDataStream s(TQT_TQIODEVICE(&f)); + CacheDataStream s(&f); TQ_INT32 version; s >> version; diff --git a/juk/collectionlist.cpp b/juk/collectionlist.cpp index 770ed92f..3cc0eb6a 100644 --- a/juk/collectionlist.cpp +++ b/juk/collectionlist.cpp @@ -230,12 +230,12 @@ CollectionList::CollectionList(PlaylistCollection *collection) : { new TDEAction(i18n("Show Playing"), TDEShortcut(), ActionCollection::actions(), "showPlaying"); - connect(action("showPlaying"), TQT_SIGNAL(activated()), this, TQT_SLOT(slotShowPlaying())); + connect(action("showPlaying"), TQ_SIGNAL(activated()), this, TQ_SLOT(slotShowPlaying())); - connect(action<TDEToolBarPopupAction>("back")->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotPopulateBackMenu())); - connect(action<TDEToolBarPopupAction>("back")->popupMenu(), TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPlayFromBackMenu(int))); + connect(action<TDEToolBarPopupAction>("back")->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotPopulateBackMenu())); + connect(action<TDEToolBarPopupAction>("back")->popupMenu(), TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPlayFromBackMenu(int))); setSorting(-1); // Temporarily disable sorting to add items faster. m_columnTags[PlaylistItem::ArtistColumn] = new TagCountDict(5001, false); diff --git a/juk/collectionlist.h b/juk/collectionlist.h index d01463ac..e3cda375 100644 --- a/juk/collectionlist.h +++ b/juk/collectionlist.h @@ -96,7 +96,7 @@ public: virtual bool canReload() const { return true; } public slots: - virtual void paste() { decode(kapp->clipboard()->data()); } + virtual void paste() { decode(tdeApp->clipboard()->data()); } virtual void clear(); void slotCheckCache(); diff --git a/juk/coverdialog.cpp b/juk/coverdialog.cpp index 9c81126b..fa152697 100644 --- a/juk/coverdialog.cpp +++ b/juk/coverdialog.cpp @@ -89,7 +89,7 @@ void CoverDialog::show() m_artists->setSorting(0); - TQTimer::singleShot(0, this, TQT_SLOT(loadCovers())); + TQTimer::singleShot(0, this, TQ_SLOT(loadCovers())); CoverDialogBase::show(); } @@ -106,7 +106,7 @@ void CoverDialog::loadCovers() if(++i == 10) { i = 0; - kapp->processEvents(); + tdeApp->processEvents(); } } } @@ -142,7 +142,7 @@ void CoverDialog::slotContextRequested(TQIconViewItem *item, const TQPoint &pt) if(!menu) { menu = new TDEPopupMenu(this); - menu->insertItem(i18n("Remove Cover"), this, TQT_SLOT(removeSelectedCover())); + menu->insertItem(i18n("Remove Cover"), this, TQ_SLOT(removeSelectedCover())); } menu->popup(pt); diff --git a/juk/coverdialogbase.ui b/juk/coverdialogbase.ui index 3db9862f..ed8ed1f1 100644 --- a/juk/coverdialogbase.ui +++ b/juk/coverdialogbase.ui @@ -194,10 +194,10 @@ <slot>slotContextRequested(TQIconViewItem*,const TQPoint&)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotArtistClicked(TQListViewItem *item)</slot> <slot>slotContextRequested(TQIconViewItem *, const TQPoint &pt)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <forwards> <forward>class TQIconViewItem;</forward> diff --git a/juk/coverinfo.cpp b/juk/coverinfo.cpp index 42f57674..4a5153d8 100644 --- a/juk/coverinfo.cpp +++ b/juk/coverinfo.cpp @@ -15,7 +15,7 @@ #include <tdeglobal.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tqregexp.h> diff --git a/juk/covermanager.cpp b/juk/covermanager.cpp index 95af83e5..958995ff 100644 --- a/juk/covermanager.cpp +++ b/juk/covermanager.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <kstaticdeleter.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include "covermanager.h" diff --git a/juk/deletedialog.cpp b/juk/deletedialog.cpp index f3d81680..daed8164 100644 --- a/juk/deletedialog.cpp +++ b/juk/deletedialog.cpp @@ -84,7 +84,7 @@ DeleteDialog::DeleteDialog(TQWidget *parent, const char *name) : slotShouldDelete(shouldDelete()); - connect(m_widget->ddShouldDelete, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotShouldDelete(bool))); + connect(m_widget->ddShouldDelete, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotShouldDelete(bool))); } bool DeleteDialog::confirmDeleteList(const TQStringList &condemnedFiles) diff --git a/juk/deletedialogbase.ui b/juk/deletedialogbase.ui index 24480087..56866bde 100644 --- a/juk/deletedialogbase.ui +++ b/juk/deletedialogbase.ui @@ -133,9 +133,9 @@ <slot>slotShouldDelete(bool)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">slotShouldDelete(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">tdelistbox.h</include> diff --git a/juk/directorylist.cpp b/juk/directorylist.cpp index 8a9e2a56..f8af3b85 100644 --- a/juk/directorylist.cpp +++ b/juk/directorylist.cpp @@ -39,10 +39,10 @@ DirectoryList::DirectoryList(const TQStringList &directories, bool importPlaylis m_base->directoryListView->setFullWidth(true); - connect(m_base->addDirectoryButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotAddDirectory())); - connect(m_base->removeDirectoryButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotRemoveDirectory())); + connect(m_base->addDirectoryButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotAddDirectory())); + connect(m_base->removeDirectoryButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotRemoveDirectory())); TQStringList::ConstIterator it = directories.begin(); for(; it != directories.end(); ++it) diff --git a/juk/dynamicplaylist.cpp b/juk/dynamicplaylist.cpp index 336d1e3e..c6f155da 100644 --- a/juk/dynamicplaylist.cpp +++ b/juk/dynamicplaylist.cpp @@ -60,7 +60,7 @@ DynamicPlaylist::DynamicPlaylist(const PlaylistList &playlists, for(PlaylistList::ConstIterator it = playlists.begin(); it != playlists.end(); ++it) m_observers.append(new PlaylistDirtyObserver(this, *it)); - connect(CollectionList::instance(), TQT_SIGNAL(signalCollectionChanged()), this, TQT_SLOT(slotSetDirty())); + connect(CollectionList::instance(), TQ_SIGNAL(signalCollectionChanged()), this, TQ_SLOT(slotSetDirty())); } DynamicPlaylist::~DynamicPlaylist() @@ -153,7 +153,7 @@ void DynamicPlaylist::updateItems() PlaylistItemList newSiblings = siblings; if(m_siblings != newSiblings) { m_siblings = newSiblings; - TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateItems())); + TQTimer::singleShot(0, this, TQ_SLOT(slotUpdateItems())); } } diff --git a/juk/exampleoptions.cpp b/juk/exampleoptions.cpp index dc95baa1..bc2b4f01 100644 --- a/juk/exampleoptions.cpp +++ b/juk/exampleoptions.cpp @@ -55,12 +55,12 @@ ExampleOptionsDialog::ExampleOptionsDialog(TQWidget *parent) : // Forward signals - connect(m_options, TQT_SIGNAL(fileChanged()), TQT_SLOT(fileModeSelected())); - connect(m_options, TQT_SIGNAL(dataChanged()), TQT_SIGNAL(dataChanged())); - connect(m_options->m_exampleFile, TQT_SIGNAL(urlSelected(const TQString &)), - this, TQT_SIGNAL(fileChanged(const TQString &))); - connect(m_options->m_exampleFile, TQT_SIGNAL(returnPressed(const TQString &)), - this, TQT_SIGNAL(fileChanged(const TQString &))); + connect(m_options, TQ_SIGNAL(fileChanged()), TQ_SLOT(fileModeSelected())); + connect(m_options, TQ_SIGNAL(dataChanged()), TQ_SIGNAL(dataChanged())); + connect(m_options->m_exampleFile, TQ_SIGNAL(urlSelected(const TQString &)), + this, TQ_SIGNAL(fileChanged(const TQString &))); + connect(m_options->m_exampleFile, TQ_SIGNAL(returnPressed(const TQString &)), + this, TQ_SIGNAL(fileChanged(const TQString &))); } void ExampleOptionsDialog::hideEvent(TQHideEvent *) diff --git a/juk/exampleoptionsbase.ui b/juk/exampleoptionsbase.ui index 87563c25..c5a09acf 100644 --- a/juk/exampleoptionsbase.ui +++ b/juk/exampleoptionsbase.ui @@ -267,15 +267,15 @@ <tabstop>m_exampleTrack</tabstop> <tabstop>m_exampleYear</tabstop> </tabstops> -<Q_SIGNALS> +<signals> <signal>dataChanged()</signal> <signal>fileChanged()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot access="protected">exampleSelectionChanged()</slot> <slot access="protected">exampleDataChanged()</slot> <slot access="protected">exampleFileChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp index 88681efe..667a20fe 100644 --- a/juk/filerenamer.cpp +++ b/juk/filerenamer.cpp @@ -22,7 +22,7 @@ #include <kurlrequester.h> #include <kiconloader.h> #include <knuminput.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeio/netaccess.h> #include <tdeconfigbase.h> #include <tdeconfig.h> @@ -32,7 +32,7 @@ #include <kpushbutton.h> #include <tdeapplication.h> #include <tdemessagebox.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tqfile.h> #include <tqhbox.h> @@ -248,11 +248,11 @@ FileRenamerWidget::FileRenamerWidget(TQWidget *parent) : m_category->insertItem(category); } - connect(m_exampleDialog, TQT_SIGNAL(signalShown()), TQT_SLOT(exampleDialogShown())); - connect(m_exampleDialog, TQT_SIGNAL(signalHidden()), TQT_SLOT(exampleDialogHidden())); - connect(m_exampleDialog, TQT_SIGNAL(dataChanged()), TQT_SLOT(dataSelected())); - connect(m_exampleDialog, TQT_SIGNAL(fileChanged(const TQString &)), - this, TQT_SLOT(fileSelected(const TQString &))); + connect(m_exampleDialog, TQ_SIGNAL(signalShown()), TQ_SLOT(exampleDialogShown())); + connect(m_exampleDialog, TQ_SIGNAL(signalHidden()), TQ_SLOT(exampleDialogHidden())); + connect(m_exampleDialog, TQ_SIGNAL(dataChanged()), TQ_SLOT(dataSelected())); + connect(m_exampleDialog, TQ_SIGNAL(fileChanged(const TQString &)), + this, TQ_SLOT(fileSelected(const TQString &))); exampleTextChanged(); } @@ -347,10 +347,10 @@ unsigned FileRenamerWidget::addRowCategory(TagType category) row.upButton->setFlat(true); row.downButton->setFlat(true); - upMapper->connect(row.upButton, TQT_SIGNAL(clicked()), TQT_SLOT(map())); - upMapper->setMapping(TQT_TQOBJECT(row.upButton), id); - downMapper->connect(row.downButton, TQT_SIGNAL(clicked()), TQT_SLOT(map())); - downMapper->setMapping(TQT_TQOBJECT(row.downButton), id); + upMapper->connect(row.upButton, TQ_SIGNAL(clicked()), TQ_SLOT(map())); + upMapper->setMapping(row.upButton, id); + downMapper->connect(row.downButton, TQ_SIGNAL(clicked()), TQ_SLOT(map())); + downMapper->setMapping(row.downButton, id); TQString labelText = TQString("<b>%1</b>").arg(TagRenamerOptions::tagTypeText(category)); TQLabel *label = new TQLabel(labelText, frame); @@ -359,12 +359,12 @@ unsigned FileRenamerWidget::addRowCategory(TagType category) TQVBox *options = new TQVBox(frame); row.enableButton = new KPushButton(i18n("Remove"), options); - toggleMapper->connect(row.enableButton, TQT_SIGNAL(clicked()), TQT_SLOT(map())); - toggleMapper->setMapping(TQT_TQOBJECT(row.enableButton), id); + toggleMapper->connect(row.enableButton, TQ_SIGNAL(clicked()), TQ_SLOT(map())); + toggleMapper->setMapping(row.enableButton, id); row.optionsButton = new KPushButton(i18n("Options"), options); - mapper->connect(row.optionsButton, TQT_SIGNAL(clicked()), TQT_SLOT(map())); - mapper->setMapping(TQT_TQOBJECT(row.optionsButton), id); + mapper->connect(row.optionsButton, TQ_SIGNAL(clicked()), TQ_SLOT(map())); + mapper->setMapping(row.optionsButton, id); row.widget->show(); m_rows.append(row); @@ -378,10 +378,10 @@ unsigned FileRenamerWidget::addRowCategory(TagType category) void FileRenamerWidget::moveSignalMappings(unsigned oldId, unsigned newId) { - mapper->setMapping(TQT_TQOBJECT(m_rows[oldId].optionsButton), newId); - downMapper->setMapping(TQT_TQOBJECT(m_rows[oldId].downButton), newId); - upMapper->setMapping(TQT_TQOBJECT(m_rows[oldId].upButton), newId); - toggleMapper->setMapping(TQT_TQOBJECT(m_rows[oldId].enableButton), newId); + mapper->setMapping(m_rows[oldId].optionsButton, newId); + downMapper->setMapping(m_rows[oldId].downButton, newId); + upMapper->setMapping(m_rows[oldId].upButton, newId); + toggleMapper->setMapping(m_rows[oldId].enableButton, newId); } bool FileRenamerWidget::removeRow(unsigned id) @@ -448,7 +448,7 @@ bool FileRenamerWidget::removeRow(unsigned id) // We can insert another row now, make sure GUI is updated to match. m_insertCategory->setEnabled(true); - TQTimer::singleShot(0, this, TQT_SLOT(exampleTextChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(exampleTextChanged())); return true; } @@ -462,8 +462,8 @@ void FileRenamerWidget::addFolderSeparatorCheckbox() l->addWidget(cb, 0, AlignCenter); cb->setChecked(false); - connect(cb, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(exampleTextChanged())); + connect(cb, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(exampleTextChanged())); temp->show(); } @@ -480,15 +480,15 @@ void FileRenamerWidget::createTagRows() m_rows.reserve(categoryOrder.count()); m_folderSwitches.reserve(categoryOrder.count() - 1); - mapper = new TQSignalMapper(TQT_TQOBJECT(this), "signal mapper"); - toggleMapper = new TQSignalMapper(TQT_TQOBJECT(this), "toggle mapper"); - upMapper = new TQSignalMapper(TQT_TQOBJECT(this), "up button mapper"); - downMapper = new TQSignalMapper(TQT_TQOBJECT(this), "down button mapper"); + mapper = new TQSignalMapper(this, "signal mapper"); + toggleMapper = new TQSignalMapper(this, "toggle mapper"); + upMapper = new TQSignalMapper(this, "up button mapper"); + downMapper = new TQSignalMapper(this, "down button mapper"); - connect(mapper, TQT_SIGNAL(mapped(int)), TQT_SLOT(showCategoryOption(int))); - connect(toggleMapper, TQT_SIGNAL(mapped(int)), TQT_SLOT(slotRemoveRow(int))); - connect(upMapper, TQT_SIGNAL(mapped(int)), TQT_SLOT(moveItemUp(int))); - connect(downMapper, TQT_SIGNAL(mapped(int)), TQT_SLOT(moveItemDown(int))); + connect(mapper, TQ_SIGNAL(mapped(int)), TQ_SLOT(showCategoryOption(int))); + connect(toggleMapper, TQ_SIGNAL(mapped(int)), TQ_SLOT(slotRemoveRow(int))); + connect(upMapper, TQ_SIGNAL(mapped(int)), TQ_SLOT(moveItemUp(int))); + connect(downMapper, TQ_SIGNAL(mapped(int)), TQ_SLOT(moveItemDown(int))); m_mainFrame = new TQVBox(m_mainView->viewport()); m_mainFrame->setMargin(10); @@ -687,7 +687,7 @@ void FileRenamerWidget::moveItem(unsigned id, MovementDirection direction) layout->insertWidget(2 * pos, w); layout->invalidate(); - TQTimer::singleShot(0, this, TQT_SLOT(exampleTextChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(exampleTextChanged())); } unsigned FileRenamerWidget::idOfPosition(unsigned position) const @@ -948,7 +948,7 @@ void FileRenamer::setFolderIcon(const KURL &dst, const PlaylistItem *item) TQPixmap thumb = item->file().coverInfo()->pixmap(CoverInfo::Thumbnail); thumb.save(path + "/.juk-thumbnail.png", "PNG"); - KSimpleConfig config(path + "/.directory"); + TDESimpleConfig config(path + "/.directory"); config.setGroup("Desktop Entry"); if(!config.hasKey("Icon")) { diff --git a/juk/filerenamerbase.ui b/juk/filerenamerbase.ui index 2449aead..01649070 100644 --- a/juk/filerenamerbase.ui +++ b/juk/filerenamerbase.ui @@ -360,11 +360,11 @@ <tabstop>m_insertCategory</tabstop> <tabstop>m_showExample</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">exampleTextChanged()</slot> <slot access="protected">toggleExampleDialog()</slot> <slot access="protected">insertCategory()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/juk/filerenameroptionsbase.ui b/juk/filerenameroptionsbase.ui index ab3d2f61..061a5c5b 100644 --- a/juk/filerenameroptionsbase.ui +++ b/juk/filerenameroptionsbase.ui @@ -413,11 +413,11 @@ <slot>slotEmptyActionChanged()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">slotBracketsChanged()</slot> <slot access="protected">slotTrackWidthChanged()</slot> <slot access="protected">slotEmptyActionChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">knuminput.h</include> diff --git a/juk/folderplaylist.cpp b/juk/folderplaylist.cpp index 71934359..e12e0746 100644 --- a/juk/folderplaylist.cpp +++ b/juk/folderplaylist.cpp @@ -26,7 +26,7 @@ FolderPlaylist::FolderPlaylist(PlaylistCollection *collection, const TQString &f Playlist(collection, name, "folder"), m_folder(folder) { - TQTimer::singleShot(0, this, TQT_SLOT(slotReload())); + TQTimer::singleShot(0, this, TQ_SLOT(slotReload())); } FolderPlaylist::~FolderPlaylist() @@ -42,7 +42,7 @@ TQString FolderPlaylist::folder() const void FolderPlaylist::setFolder(const TQString &s) { m_folder = s; - TQTimer::singleShot(0, this, TQT_SLOT(slotReload())); + TQTimer::singleShot(0, this, TQ_SLOT(slotReload())); } //////////////////////////////////////////////////////////////////////////////// diff --git a/juk/gstreamerplayer.cpp b/juk/gstreamerplayer.cpp index 26bd8aef..74f8603b 100644 --- a/juk/gstreamerplayer.cpp +++ b/juk/gstreamerplayer.cpp @@ -149,8 +149,8 @@ void GStreamerPlayer::setupPipeline() { static bool initialized = false; if(!initialized) { - int argc = kapp->argc(); - char **argv = kapp->argv(); + int argc = tdeApp->argc(); + char **argv = tdeApp->argv(); gst_init(&argc, &argv); initialized = true; } @@ -193,7 +193,7 @@ static GstBusSyncReply messageHandler(GstBus *, GstMessage *message, gpointer da { if(GST_MESSAGE_TYPE(message) == GST_MESSAGE_EOS) { GStreamerPlayer *player = static_cast<GStreamerPlayer *>(data); - TQTimer::singleShot(0, player, TQT_SLOT(stop())); + TQTimer::singleShot(0, player, TQ_SLOT(stop())); } gst_message_unref(message); @@ -299,8 +299,8 @@ void GStreamerPlayer::setupPipeline() { static bool initialized = false; if(!initialized) { - int argc = kapp->argc(); - char **argv = kapp->argv(); + int argc = tdeApp->argc(); + char **argv = tdeApp->argv(); gst_init(&argc, &argv); initialized = true; } diff --git a/juk/historyplaylist.cpp b/juk/historyplaylist.cpp index 47e6fddb..85d01c0c 100644 --- a/juk/historyplaylist.cpp +++ b/juk/historyplaylist.cpp @@ -31,8 +31,8 @@ HistoryPlaylist::HistoryPlaylist(PlaylistCollection *collection) : setAllowDuplicates(true); m_timer = new TQTimer(this); - connect(PlayerManager::instance(), TQT_SIGNAL(signalPlay()), this, TQT_SLOT(slotAddPlaying())); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCreateNewItem())); + connect(PlayerManager::instance(), TQ_SIGNAL(signalPlay()), this, TQ_SLOT(slotAddPlaying())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCreateNewItem())); } HistoryPlaylist::~HistoryPlaylist() diff --git a/juk/juk.cpp b/juk/juk.cpp index c66c19fc..57794459 100644 --- a/juk/juk.cpp +++ b/juk/juk.cpp @@ -19,7 +19,7 @@ #include <kstatusbar.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "juk.h" @@ -54,7 +54,7 @@ JuK::JuK(TQWidget *parent, const char *name) : if(m_showSplash && !m_startDocked && Cache::cacheFileExists()) { SplashScreen::instance()->show(); - kapp->processEvents(); + tdeApp->processEvents(); } setupActions(); @@ -71,8 +71,8 @@ JuK::JuK(TQWidget *parent, const char *name) : createDirs(); SplashScreen::finishedLoading(); - TQTimer::singleShot(0, CollectionList::instance(), TQT_SLOT(slotCheckCache())); - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotProcessArgs())); + TQTimer::singleShot(0, CollectionList::instance(), TQ_SLOT(slotCheckCache())); + TQTimer::singleShot(0, this, TQ_SLOT(slotProcessArgs())); m_sliderAction->slotUpdateOrientation(); } @@ -99,8 +99,8 @@ void JuK::setupLayout() setCentralWidget(m_splitter); m_statusLabel = new StatusLabel(m_splitter->playlist(), statusBar()); - connect(CollectionList::instance(), TQT_SIGNAL(signalCollectionChanged()), - m_statusLabel, TQT_SLOT(updateData())); + connect(CollectionList::instance(), TQ_SIGNAL(signalCollectionChanged()), + m_statusLabel, TQ_SLOT(updateData())); statusBar()->addWidget(m_statusLabel, 1); PlayerManager::instance()->setStatusLabel(m_statusLabel); @@ -112,15 +112,15 @@ void JuK::setupActions() { ActionCollection::actions()->setWidget(this); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), ActionCollection::actions()); - KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), ActionCollection::actions()); - KStdAction::cut(TQT_TQOBJECT(kapp), TQT_SLOT(cut()), ActionCollection::actions()); - KStdAction::copy(TQT_TQOBJECT(kapp), TQT_SLOT(copy()), ActionCollection::actions()); - KStdAction::paste(TQT_TQOBJECT(kapp), TQT_SLOT(paste()), ActionCollection::actions()); - KStdAction::clear(TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions()); - KStdAction::selectAll(TQT_TQOBJECT(kapp), TQT_SLOT(selectAll()), ActionCollection::actions()); + KStdAction::quit(this, TQ_SLOT(slotQuit()), ActionCollection::actions()); + KStdAction::undo(this, TQ_SLOT(slotUndo()), ActionCollection::actions()); + KStdAction::cut(tdeApp, TQ_SLOT(cut()), ActionCollection::actions()); + KStdAction::copy(tdeApp, TQ_SLOT(copy()), ActionCollection::actions()); + KStdAction::paste(tdeApp, TQ_SLOT(paste()), ActionCollection::actions()); + KStdAction::clear(tdeApp, TQ_SLOT(clear()), ActionCollection::actions()); + KStdAction::selectAll(tdeApp, TQ_SLOT(selectAll()), ActionCollection::actions()); - new TDEAction(i18n("Remove From Playlist"), "edit_remove", 0, TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist"); + new TDEAction(i18n("Remove From Playlist"), "edit_remove", 0, tdeApp, TQ_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist"); TDEActionMenu *actionMenu = new TDEActionMenu(i18n("&Random Play"), "roll", ActionCollection::actions(), "actionMenu"); actionMenu->setDelayed(false); @@ -135,15 +135,15 @@ void JuK::setupActions() ka = new TDERadioAction(i18n("Use &Album Random Play"), "roll", 0, ActionCollection::actions(), "albumRandomPlay"); ka->setExclusiveGroup("randomPlayGroup"); - connect(ka, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCheckAlbumNextAction(bool))); + connect(ka, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotCheckAlbumNextAction(bool))); actionMenu->insert(ka); - new TDEAction(i18n("&Play"), "media-playback-start", 0, TQT_TQOBJECT(m_player), TQT_SLOT(play()), ActionCollection::actions(), "play"); - new TDEAction(i18n("P&ause"), "media-playback-pause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(pause()), ActionCollection::actions(), "pause"); - new TDEAction(i18n("&Stop"), "media-playback-stop", 0, TQT_TQOBJECT(m_player), TQT_SLOT(stop()), ActionCollection::actions(), "stop"); + new TDEAction(i18n("&Play"), "media-playback-start", 0, m_player, TQ_SLOT(play()), ActionCollection::actions(), "play"); + new TDEAction(i18n("P&ause"), "media-playback-pause", 0, m_player, TQ_SLOT(pause()), ActionCollection::actions(), "pause"); + new TDEAction(i18n("&Stop"), "media-playback-stop", 0, m_player, TQ_SLOT(stop()), ActionCollection::actions(), "stop"); - new TDEToolBarPopupAction(i18n("previous track", "Previous"), "media-skip-backward", TDEShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(back()), ActionCollection::actions(), "back"); - new TDEAction(i18n("next track", "&Next"), "media-skip-forward", TDEShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(forward()), ActionCollection::actions(), "forward"); + new TDEToolBarPopupAction(i18n("previous track", "Previous"), "media-skip-backward", TDEShortcut(), m_player, TQ_SLOT(back()), ActionCollection::actions(), "back"); + new TDEAction(i18n("next track", "&Next"), "media-skip-forward", TDEShortcut(), m_player, TQ_SLOT(forward()), ActionCollection::actions(), "forward"); new TDEToggleAction(i18n("&Loop Playlist"), 0, TDEShortcut(), ActionCollection::actions(), "loopPlaylist"); TDEToggleAction *resizeColumnAction = new TDEToggleAction(i18n("&Resize Playlist Columns Manually"), @@ -152,12 +152,12 @@ void JuK::setupActions() // the following are not visible by default - new TDEAction(i18n("Mute"), "mute", 0, TQT_TQOBJECT(m_player), TQT_SLOT(mute()), ActionCollection::actions(), "mute"); - new TDEAction(i18n("Volume Up"), "volumeUp", 0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeUp()), ActionCollection::actions(), "volumeUp"); - new TDEAction(i18n("Volume Down"), "volumeDown", 0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeDown()), ActionCollection::actions(), "volumeDown"); - new TDEAction(i18n("Play / Pause"), "playPause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(playPause()), ActionCollection::actions(), "playPause"); - new TDEAction(i18n("Seek Forward"), "seekForward", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekForward()), ActionCollection::actions(), "seekForward"); - new TDEAction(i18n("Seek Back"), "seekBack", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekBack()), ActionCollection::actions(), "seekBack"); + new TDEAction(i18n("Mute"), "mute", 0, m_player, TQ_SLOT(mute()), ActionCollection::actions(), "mute"); + new TDEAction(i18n("Volume Up"), "volumeUp", 0, m_player, TQ_SLOT(volumeUp()), ActionCollection::actions(), "volumeUp"); + new TDEAction(i18n("Volume Down"), "volumeDown", 0, m_player, TQ_SLOT(volumeDown()), ActionCollection::actions(), "volumeDown"); + new TDEAction(i18n("Play / Pause"), "playPause", 0, m_player, TQ_SLOT(playPause()), ActionCollection::actions(), "playPause"); + new TDEAction(i18n("Seek Forward"), "seekForward", 0, m_player, TQ_SLOT(seekForward()), ActionCollection::actions(), "seekForward"); + new TDEAction(i18n("Seek Back"), "seekBack", 0, m_player, TQ_SLOT(seekBack()), ActionCollection::actions(), "seekBack"); ////////////////////////////////////////////////// // settings menu @@ -175,12 +175,12 @@ void JuK::setupActions() TDEShortcut(), ActionCollection::actions(), "dockOnClose"); m_togglePopupsAction = new TDEToggleAction(i18n("Popup &Track Announcement"), - TDEShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "togglePopups"); + TDEShortcut(), this, 0, ActionCollection::actions(), "togglePopups"); new TDEToggleAction(i18n("Save &Play Queue on Exit"), - TDEShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "saveUpcomingTracks"); + TDEShortcut(), this, 0, ActionCollection::actions(), "saveUpcomingTracks"); - connect(m_toggleSystemTrayAction, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotToggleSystemTray(bool))); + connect(m_toggleSystemTrayAction, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggleSystemTray(bool))); m_outputSelectAction = PlayerManager::playerSelectAction(ActionCollection::actions()); @@ -188,13 +188,13 @@ void JuK::setupActions() if(m_outputSelectAction) m_outputSelectAction->setCurrentItem(0); - new TDEAction(i18n("&Tag Guesser..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureTagGuesser()), + new TDEAction(i18n("&Tag Guesser..."), 0, 0, this, TQ_SLOT(slotConfigureTagGuesser()), ActionCollection::actions(), "tagGuesserConfig"); - new TDEAction(i18n("&File Renamer..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureFileRenamer()), + new TDEAction(i18n("&File Renamer..."), 0, 0, this, TQ_SLOT(slotConfigureFileRenamer()), ActionCollection::actions(), "fileRenamerConfig"); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), ActionCollection::actions()); + KStdAction::keyBindings(this, TQ_SLOT(slotEditKeys()), ActionCollection::actions()); ////////////////////////////////////////////////// // just in the toolbar @@ -213,7 +213,7 @@ void JuK::setupSystemTray() m_toggleDockOnCloseAction->setEnabled(true); m_togglePopupsAction->setEnabled(true); - connect(m_systemTray, TQT_SIGNAL(quitSelected()), TQT_TQOBJECT(this), TQT_SLOT(slotAboutToQuit())); + connect(m_systemTray, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(slotAboutToQuit())); } else { m_systemTray = 0; @@ -224,20 +224,20 @@ void JuK::setupSystemTray() void JuK::setupGlobalAccels() { - m_accel = new TDEGlobalAccel(TQT_TQOBJECT(this)); - - KeyDialog::insert(m_accel, "Play", i18n("Play"), action("play"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "PlayPause", i18n("Play / Pause"), action("playPause"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "Stop", i18n("Stop Playing"), action("stop"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "Back", i18n("Back"), action("back"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "Forward", i18n("Forward"), action("forward"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "SeekBack", i18n("Seek Back"), action("seekBack"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "SeekForward", i18n("Seek Forward"), action("seekForward"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "VolumeUp", i18n("Volume Up"), action("volumeUp"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "VolumeDown", i18n("Volume Down"), action("volumeDown"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "Mute", i18n("Mute"), action("mute"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "ShowHide", i18n("Show / Hide"), TQT_TQOBJECT(this), TQT_SLOT(slotShowHide())); - KeyDialog::insert(m_accel, "ForwardAlbum", i18n("Play Next Album"), action("forwardAlbum"), TQT_SLOT(activate())); + m_accel = new TDEGlobalAccel(this); + + KeyDialog::insert(m_accel, "Play", i18n("Play"), action("play"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "PlayPause", i18n("Play / Pause"), action("playPause"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "Stop", i18n("Stop Playing"), action("stop"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "Back", i18n("Back"), action("back"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "Forward", i18n("Forward"), action("forward"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "SeekBack", i18n("Seek Back"), action("seekBack"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "SeekForward", i18n("Seek Forward"), action("seekForward"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "VolumeUp", i18n("Volume Up"), action("volumeUp"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "VolumeDown", i18n("Volume Down"), action("volumeDown"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "Mute", i18n("Mute"), action("mute"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "ShowHide", i18n("Show / Hide"), this, TQ_SLOT(slotShowHide())); + KeyDialog::insert(m_accel, "ForwardAlbum", i18n("Play Next Album"), action("forwardAlbum"), TQ_SLOT(activate())); m_accel->setConfigGroup("Shortcuts"); m_accel->readSettings(); @@ -257,7 +257,7 @@ void JuK::slotProcessArgs() void JuK::createDirs() { - TQDir dir(TDEGlobal::dirs()->saveLocation("data", kapp->instanceName() + '/')); + TQDir dir(TDEGlobal::dirs()->saveLocation("data", tdeApp->instanceName() + '/')); if (!dir.exists("covers", false)) dir.mkdir("covers", false); dir.cd("covers"); @@ -391,7 +391,7 @@ bool JuK::queryClose() kdDebug(65432) << k_funcinfo << endl; if(!m_shuttingDown && - !kapp->sessionSaving() && + !tdeApp->sessionSaving() && m_systemTray && m_toggleDockOnCloseAction->isChecked()) { @@ -425,7 +425,7 @@ void JuK::slotQuit() kdDebug(65432) << k_funcinfo << endl; m_shuttingDown = true; - kapp->quit(); + tdeApp->quit(); } //////////////////////////////////////////////////////////////////////////////// diff --git a/juk/k3bexporter.cpp b/juk/k3bexporter.cpp index 91ad104a..9ed2c6ce 100644 --- a/juk/k3bexporter.cpp +++ b/juk/k3bexporter.cpp @@ -13,13 +13,13 @@ * * ***************************************************************************/ -#include <kprocess.h> +#include <tdeprocess.h> #include <tdemessagebox.h> #include <kurl.h> #include <tdelocale.h> #include <tdeaction.h> #include <tdeactioncollection.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <tdeapplication.h> @@ -62,7 +62,7 @@ class PlaylistAction : public TDEAction typedef TQMap<const Playlist *, TQObject *> PlaylistRecipientMap; /** - * Defines a TQObject to call (using the m_slot SLOT) when an action is + * Defines a TQObject to call (using the m_slot TQ_SLOT) when an action is * emitted from a Playlist. */ void addCallMapping(const Playlist *p, TQObject *obj) @@ -87,9 +87,9 @@ class PlaylistAction : public TDEAction // Invoke the slot using some trickery. // XXX: Use the TQMetaObject to do this in TQt 4. - connect(this, TQT_SIGNAL(activated()), recipient, m_slot); + connect(this, TQ_SIGNAL(activated()), recipient, m_slot); emit(activated()); - disconnect(this, TQT_SIGNAL(activated()), recipient, m_slot); + disconnect(this, TQ_SIGNAL(activated()), recipient, m_slot); } private: @@ -108,7 +108,7 @@ TDEAction *K3bExporter::action() "export_to_k3b", i18n("Add Selected Items to Audio or Data CD"), SmallIconSet("k3b"), - TQT_SLOT(slotExport()) + TQ_SLOT(slotExport()) ); m_action->setShortcutConfigurable(false); @@ -276,7 +276,7 @@ TDEAction *K3bPlaylistExporter::action() SmallIconSet("k3b"), 0, this, - TQT_SLOT(slotExport()), + TQ_SLOT(slotExport()), actions(), "export_playlist_to_k3b" ); diff --git a/juk/keydialog.cpp b/juk/keydialog.cpp index bc1d13a9..07584657 100644 --- a/juk/keydialog.cpp +++ b/juk/keydialog.cpp @@ -99,7 +99,7 @@ KeyDialog::KeyDialog(TDEGlobalAccel *keys, TDEActionCollection *actionCollection new TQRadioButton(i18n("&No keys"), m_group); new TQRadioButton(i18n("&Standard keys"), m_group); new TQRadioButton(i18n("&Multimedia keys"), m_group); - connect(m_group, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotKeys(int))); + connect(m_group, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotKeys(int))); TQWhatsThis::add(m_group, i18n("Here you can select the keys used as global shortcuts to control the player")); @@ -127,7 +127,7 @@ void KeyDialog::newDialog(TDEGlobalAccel *keys, TDEActionCollection *actionColle m_widgetStack->raiseWidget(m_pKeyChooser); m_group->setButton(selectedButton); - connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(slotDefault())); + connect(this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(slotDefault())); } int KeyDialog::configure() diff --git a/juk/keydialog.h b/juk/keydialog.h index b23eff8f..347042c1 100644 --- a/juk/keydialog.h +++ b/juk/keydialog.h @@ -17,7 +17,7 @@ #define KEYDIALOG_H #include <tdeversion.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <kkeydialog.h> #include <tqhbuttongroup.h> diff --git a/juk/main.cpp b/juk/main.cpp index 35ffd168..33d7fcb2 100644 --- a/juk/main.cpp +++ b/juk/main.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <dcopclient.h> @@ -73,9 +73,9 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); - KUniqueApplication a; + TDEUniqueApplication a; // Here we do some DCOP locking of sorts to prevent incoming DCOP calls // before JuK has finished its initialization. diff --git a/juk/musicbrainzquery.cpp b/juk/musicbrainzquery.cpp index f1042930..2e449f86 100644 --- a/juk/musicbrainzquery.cpp +++ b/juk/musicbrainzquery.cpp @@ -67,7 +67,7 @@ void MusicBrainzLookup::error() void MusicBrainzLookup::message(const TQString &s) const { - TDEMainWindow *w = static_cast<TDEMainWindow *>(kapp->mainWidget()); + TDEMainWindow *w = static_cast<TDEMainWindow *>(tdeApp->mainWidget()); w->statusBar()->message(TQString("%1 (%2)").arg(s).arg(m_file.fileInfo().fileName()), 3000); } diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp index 838aadd2..6c3110fa 100644 --- a/juk/nowplaying.cpp +++ b/juk/nowplaying.cpp @@ -67,8 +67,8 @@ NowPlaying::NowPlaying(TQWidget *parent, PlaylistCollection *collection, const c setStretchFactor(new Line(this), 0); setStretchFactor(new HistoryItem(this), 1); - connect(PlayerManager::instance(), TQT_SIGNAL(signalPlay()), this, TQT_SLOT(slotUpdate())); - connect(PlayerManager::instance(), TQT_SIGNAL(signalStop()), this, TQT_SLOT(slotUpdate())); + connect(PlayerManager::instance(), TQ_SIGNAL(signalPlay()), this, TQ_SLOT(slotUpdate())); + connect(PlayerManager::instance(), TQ_SIGNAL(signalStop()), this, TQ_SLOT(slotUpdate())); hide(); } @@ -230,14 +230,14 @@ TrackItem::TrackItem(NowPlaying *parent) : layout->addWidget(m_label); layout->addStretch(); - connect(m_label, TQT_SIGNAL(linkClicked(const TQString &)), this, - TQT_SLOT(slotOpenLink(const TQString &))); + connect(m_label, TQ_SIGNAL(linkClicked(const TQString &)), this, + TQ_SLOT(slotOpenLink(const TQString &))); } void TrackItem::update(const FileHandle &file) { m_file = file; - TQTimer::singleShot(0, this, TQT_SLOT(slotUpdate())); + TQTimer::singleShot(0, this, TQ_SLOT(slotUpdate())); } void TrackItem::slotOpenLink(const TQString &link) @@ -297,7 +297,7 @@ HistoryItem::HistoryItem(NowPlaying *parent) : setText(TQString("<b>%1</b>").arg(i18n("History"))); m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAddPlaying())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAddPlaying())); } void HistoryItem::update(const FileHandle &file) diff --git a/juk/playermanager.cpp b/juk/playermanager.cpp index 044198c3..8fe33f72 100644 --- a/juk/playermanager.cpp +++ b/juk/playermanager.cpp @@ -642,12 +642,12 @@ void PlayerManager::setup() m_sliderAction = action<SliderAction>("trackPositionAction"); - connect(m_sliderAction, TQT_SIGNAL(signalPositionChanged(int)), - this, TQT_SLOT(seekPosition(int))); - connect(m_sliderAction->trackPositionSlider(), TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotUpdateTime(int))); - connect(m_sliderAction, TQT_SIGNAL(signalVolumeChanged(int)), - this, TQT_SLOT(slotSetVolume(int))); + connect(m_sliderAction, TQ_SIGNAL(signalPositionChanged(int)), + this, TQ_SLOT(seekPosition(int))); + connect(m_sliderAction->trackPositionSlider(), TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotUpdateTime(int))); + connect(m_sliderAction, TQ_SIGNAL(signalVolumeChanged(int)), + this, TQ_SLOT(slotSetVolume(int))); // Call this method manually to avoid warnings. @@ -655,7 +655,7 @@ void PlayerManager::setup() if(outputAction) { setOutput(static_cast<TDESelectAction *>(outputAction)->currentText()); - connect(outputAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSetOutput(const TQString &))); + connect(outputAction, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotSetOutput(const TQString &))); } else m_player = createPlayer(); @@ -673,7 +673,7 @@ void PlayerManager::setup() m_player->setVolume(volume); m_timer = new TQTimer(this, "play timer"); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotPollPlay())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotPollPlay())); } TQString PlayerManager::randomPlayMode() const diff --git a/juk/playlist.cpp b/juk/playlist.cpp index 21df8553..784db887 100644 --- a/juk/playlist.cpp +++ b/juk/playlist.cpp @@ -314,7 +314,7 @@ Playlist::Playlist(PlaylistCollection *collection, const TQString &name, const TQString &iconName) : TDEListView(collection->playlistStack(), name.latin1()), m_collection(collection), - m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))), + m_fetcher(new WebImageFetcher(this)), m_selectedCount(0), m_allowDuplicates(false), m_polished(false), @@ -338,7 +338,7 @@ Playlist::Playlist(PlaylistCollection *collection, const PlaylistItemList &items const TQString &name, const TQString &iconName) : TDEListView(collection->playlistStack(), name.latin1()), m_collection(collection), - m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))), + m_fetcher(new WebImageFetcher(this)), m_selectedCount(0), m_allowDuplicates(false), m_polished(false), @@ -363,7 +363,7 @@ Playlist::Playlist(PlaylistCollection *collection, const TQFileInfo &playlistFil const TQString &iconName) : TDEListView(collection->playlistStack()), m_collection(collection), - m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))), + m_fetcher(new WebImageFetcher(this)), m_selectedCount(0), m_allowDuplicates(false), m_polished(false), @@ -387,7 +387,7 @@ Playlist::Playlist(PlaylistCollection *collection, const TQFileInfo &playlistFil Playlist::Playlist(PlaylistCollection *collection, bool delaySetup) : TDEListView(collection->playlistStack()), m_collection(collection), - m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))), + m_fetcher(new WebImageFetcher(this)), m_selectedCount(0), m_allowDuplicates(false), m_polished(false), @@ -729,12 +729,12 @@ void Playlist::synchronizePlayingItems(const PlaylistList &sources, bool setMast void Playlist::copy() { - kapp->clipboard()->setData(dragObject(0), TQClipboard::Clipboard); + tdeApp->clipboard()->setData(dragObject(0), TQClipboard::Clipboard); } void Playlist::paste() { - decode(kapp->clipboard()->data(), static_cast<PlaylistItem *>(currentItem())); + decode(tdeApp->clipboard()->data(), static_cast<PlaylistItem *>(currentItem())); } void Playlist::clear() @@ -1142,7 +1142,7 @@ bool Playlist::eventFilter(TQObject *watched, TQEvent *e) } if(!manualResize() && m_widthsDirty) - TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateColumnWidths())); + TQTimer::singleShot(0, this, TQ_SLOT(slotUpdateColumnWidths())); break; } default: @@ -1547,7 +1547,7 @@ void Playlist::polish() // setup header RMB menu ////////////////////////////////////////////////// - m_columnVisibleAction = new TDEActionMenu(i18n("&Show Columns"), TQT_TQOBJECT(this), "showColumns"); + m_columnVisibleAction = new TDEActionMenu(i18n("&Show Columns"), this, "showColumns"); m_headerMenu = m_columnVisibleAction->popupMenu(); m_headerMenu->insertTitle(i18n("Show")); @@ -1561,25 +1561,25 @@ void Playlist::polish() adjustColumn(i); } - connect(m_headerMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotToggleColumnVisible(int))); + connect(m_headerMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotToggleColumnVisible(int))); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(slotShowRMBMenu(TQListViewItem *, const TQPoint &, int))); - connect(this, TQT_SIGNAL(itemRenamed(TQListViewItem *, const TQString &, int)), - this, TQT_SLOT(slotInlineEditDone(TQListViewItem *, const TQString &, int))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - this, TQT_SLOT(slotPlayCurrent())); - connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), - this, TQT_SLOT(slotPlayCurrent())); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(slotShowRMBMenu(TQListViewItem *, const TQPoint &, int))); + connect(this, TQ_SIGNAL(itemRenamed(TQListViewItem *, const TQString &, int)), + this, TQ_SLOT(slotInlineEditDone(TQListViewItem *, const TQString &, int))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + this, TQ_SLOT(slotPlayCurrent())); + connect(this, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT(slotPlayCurrent())); - connect(header(), TQT_SIGNAL(sizeChange(int, int, int)), - this, TQT_SLOT(slotColumnSizeChanged(int, int, int))); + connect(header(), TQ_SIGNAL(sizeChange(int, int, int)), + this, TQ_SLOT(slotColumnSizeChanged(int, int, int))); - connect(renameLineEdit(), TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - this, TQT_SLOT(slotInlineCompletionModeChanged(TDEGlobalSettings::Completion))); + connect(renameLineEdit(), TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + this, TQ_SLOT(slotInlineCompletionModeChanged(TDEGlobalSettings::Completion))); - connect(action("resizeColumnsManually"), TQT_SIGNAL(activated()), - this, TQT_SLOT(slotColumnResizeModeChanged())); + connect(action("resizeColumnsManually"), TQ_SIGNAL(activated()), + this, TQ_SLOT(slotColumnResizeModeChanged())); if(action<TDEToggleAction>("resizeColumnsManually")->isChecked()) setHScrollBarMode(Auto); @@ -1653,13 +1653,13 @@ void Playlist::setup() { setItemMargin(3); - connect(header(), TQT_SIGNAL(indexChange(int, int, int)), this, TQT_SLOT(slotColumnOrderChanged(int, int, int))); + connect(header(), TQ_SIGNAL(indexChange(int, int, int)), this, TQ_SLOT(slotColumnOrderChanged(int, int, int))); - connect(m_fetcher, TQT_SIGNAL(signalCoverChanged(int)), this, TQT_SLOT(slotCoverChanged(int))); + connect(m_fetcher, TQ_SIGNAL(signalCoverChanged(int)), this, TQ_SLOT(slotCoverChanged(int))); // Prevent list of selected items from changing while internet search is in // progress. - connect(this, TQT_SIGNAL(selectionChanged()), m_fetcher, TQT_SLOT(abortSearch())); + connect(this, TQ_SIGNAL(selectionChanged()), m_fetcher, TQ_SLOT(abortSearch())); setSorting(1); } @@ -1727,7 +1727,7 @@ void Playlist::setPlaying(PlaylistItem *item, bool addToHistory) TrackSequenceManager::instance()->setCurrent(item); TQByteArray data; - kapp->dcopClient()->emitDCOPSignal("Player", "trackChanged()", data); + tdeApp->dcopClient()->emitDCOPSignal("Player", "trackChanged()", data); if(!item) return; @@ -2078,7 +2078,7 @@ void Playlist::slotShowRMBMenu(TQListViewItem *item, const TQPoint &point, int c m_rmbMenu = new TDEPopupMenu(this); m_rmbUpcomingID = m_rmbMenu->insertItem(SmallIcon("today"), - i18n("Add to Play Queue"), this, TQT_SLOT(slotAddToUpcoming())); + i18n("Add to Play Queue"), this, TQ_SLOT(slotAddToUpcoming())); m_rmbMenu->insertSeparator(); if(!readOnly()) { @@ -2092,7 +2092,7 @@ void Playlist::slotShowRMBMenu(TQListViewItem *item, const TQPoint &point, int c action("edit_copy")->plug(m_rmbMenu); m_rmbEditID = m_rmbMenu->insertItem( - i18n("Edit"), this, TQT_SLOT(slotRenameTag())); + i18n("Edit"), this, TQ_SLOT(slotRenameTag())); action("refresh")->plug(m_rmbMenu); action("removeItem")->plug(m_rmbMenu); @@ -2107,7 +2107,7 @@ void Playlist::slotShowRMBMenu(TQListViewItem *item, const TQPoint &point, int c m_rmbMenu->insertSeparator(); m_rmbMenu->insertItem( - SmallIcon("folder-new"), i18n("Create Playlist From Selected Items..."), this, TQT_SLOT(slotCreateGroup())); + SmallIcon("folder-new"), i18n("Create Playlist From Selected Items..."), this, TQ_SLOT(slotCreateGroup())); K3bExporter *exporter = new K3bExporter(this); TDEAction *k3bAction = exporter->action(); @@ -2354,7 +2354,7 @@ bool processEvents() if(time.elapsed() > 100) { time.restart(); - kapp->processEvents(); + tdeApp->processEvents(); return true; } return false; diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp index f0450166..a9614ea3 100644 --- a/juk/playlistbox.cpp +++ b/juk/playlistbox.cpp @@ -120,36 +120,36 @@ PlaylistBox::PlaylistBox(TQWidget *parent, TQWidgetStack *playlistStack, raise(CollectionList::instance()); viewModeAction->plug(m_contextMenu); - connect(viewModeAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetViewMode(int))); + connect(viewModeAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetViewMode(int))); - connect(this, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotPlaylistChanged())); + connect(this, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotPlaylistChanged())); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - this, TQT_SLOT(slotDoubleClicked())); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + this, TQ_SLOT(slotDoubleClicked())); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(slotShowContextMenu(TQListViewItem *, const TQPoint &, int))); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(slotShowContextMenu(TQListViewItem *, const TQPoint &, int))); TagTransactionManager *tagManager = TagTransactionManager::instance(); - connect(tagManager, TQT_SIGNAL(signalAboutToModifyTags()), TQT_SLOT(slotFreezePlaylists())); - connect(tagManager, TQT_SIGNAL(signalDoneModifyingTags()), TQT_SLOT(slotUnfreezePlaylists())); + connect(tagManager, TQ_SIGNAL(signalAboutToModifyTags()), TQ_SLOT(slotFreezePlaylists())); + connect(tagManager, TQ_SIGNAL(signalDoneModifyingTags()), TQ_SLOT(slotUnfreezePlaylists())); setupUpcomingPlaylist(); - connect(CollectionList::instance(), TQT_SIGNAL(signalNewTag(const TQString &, unsigned)), - this, TQT_SLOT(slotAddItem(const TQString &, unsigned))); - connect(CollectionList::instance(), TQT_SIGNAL(signalRemovedTag(const TQString &, unsigned)), - this, TQT_SLOT(slotRemoveItem(const TQString &, unsigned))); + connect(CollectionList::instance(), TQ_SIGNAL(signalNewTag(const TQString &, unsigned)), + this, TQ_SLOT(slotAddItem(const TQString &, unsigned))); + connect(CollectionList::instance(), TQ_SIGNAL(signalRemovedTag(const TQString &, unsigned)), + this, TQ_SLOT(slotRemoveItem(const TQString &, unsigned))); - TQTimer::singleShot(0, object(), TQT_SLOT(slotScanFolders())); + TQTimer::singleShot(0, object(), TQ_SLOT(slotScanFolders())); enableDirWatch(true); // Auto-save playlists after 10 minutes - TQTimer::singleShot(600000, this, TQT_SLOT(slotSavePlaylists())); + TQTimer::singleShot(600000, this, TQ_SLOT(slotSavePlaylists())); m_showTimer = new TQTimer(this); - connect(m_showTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotShowDropTarget())); + connect(m_showTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotShowDropTarget())); } PlaylistBox::~PlaylistBox() @@ -208,7 +208,7 @@ void PlaylistBox::duplicate() void PlaylistBox::paste() { Item *i = static_cast<Item *>(currentItem()); - decode(kapp->clipboard()->data(), i); + decode(tdeApp->clipboard()->data(), i); } //////////////////////////////////////////////////////////////////////////////// @@ -232,8 +232,8 @@ void PlaylistBox::setupPlaylist(Playlist *playlist, const TQString &iconName) void PlaylistBox::setupPlaylist(Playlist *playlist, const TQString &iconName, Item *parentItem) { - connect(playlist, TQT_SIGNAL(signalPlaylistItemsDropped(Playlist *)), - TQT_SLOT(slotPlaylistItemsDropped(Playlist *))); + connect(playlist, TQ_SIGNAL(signalPlaylistItemsDropped(Playlist *)), + TQ_SLOT(slotPlaylistItemsDropped(Playlist *))); PlaylistCollection::setupPlaylist(playlist, iconName); @@ -375,7 +375,7 @@ void PlaylistBox::slotSavePlaylists() Cache::savePlaylists(l); CoverManager::saveCovers(); - TQTimer::singleShot(600000, this, TQT_SLOT(slotSavePlaylists())); + TQTimer::singleShot(600000, this, TQ_SLOT(slotSavePlaylists())); } void PlaylistBox::slotShowDropTarget() @@ -770,11 +770,11 @@ void PlaylistBox::Item::init() list->addNameToDict(m_text); if(m_playlist) { - connect(m_playlist, TQT_SIGNAL(signalNameChanged(const TQString &)), - this, TQT_SLOT(slotSetName(const TQString &))); - connect(m_playlist, TQT_SIGNAL(destroyed()), this, TQT_SLOT(deleteLater())); - connect(m_playlist, TQT_SIGNAL(signalEnableDirWatch(bool)), - list->object(), TQT_SLOT(slotEnableDirWatch(bool))); + connect(m_playlist, TQ_SIGNAL(signalNameChanged(const TQString &)), + this, TQ_SLOT(slotSetName(const TQString &))); + connect(m_playlist, TQ_SIGNAL(destroyed()), this, TQ_SLOT(deleteLater())); + connect(m_playlist, TQ_SIGNAL(signalEnableDirWatch(bool)), + list->object(), TQ_SLOT(slotEnableDirWatch(bool))); } if(m_playlist == CollectionList::instance()) { diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp index 7d4e7f7d..ab7b2659 100644 --- a/juk/playlistcollection.cpp +++ b/juk/playlistcollection.cpp @@ -44,7 +44,7 @@ #include <tqwidgetstack.h> #include <tqhbox.h> -#define widget (kapp->mainWidget()) +#define widget (tdeApp->mainWidget()) using namespace ActionCollection; @@ -158,7 +158,7 @@ TQStringList PlaylistCollection::playlists() const TQObjectList *childList = m_playlistStack->queryList("Playlist"); TQObject *obj; for(obj = childList->first(); obj; obj = childList->next()) { - Playlist *p = static_cast<Playlist *>(TQT_TQWIDGET(obj)); + Playlist *p = static_cast<Playlist *>(obj); l.append(p->name()); } @@ -582,7 +582,7 @@ void PlaylistCollection::setUpcomingPlaylistEnabled(bool enable) m_upcomingPlaylist = 0; if(raiseCollection) { - kapp->processEvents(); // Seems to stop a crash, weird. + tdeApp->processEvents(); // Seems to stop a crash, weird. raise(CollectionList::instance()); } } @@ -670,8 +670,8 @@ void PlaylistCollection::setupPlaylist(Playlist *playlist, const TQString &) if(!playlist->name().isNull()) m_playlistNames.insert(playlist->name()); - TQObject::connect(playlist, TQT_SIGNAL(selectionChanged()), - object(), TQT_SIGNAL(signalSelectedItemsChanged())); + TQObject::connect(playlist, TQ_SIGNAL(selectionChanged()), + object(), TQ_SIGNAL(signalSelectedItemsChanged())); } bool PlaylistCollection::importPlaylists() const @@ -706,16 +706,16 @@ void PlaylistCollection::clearShowMore(bool raisePlaylist) void PlaylistCollection::enableDirWatch(bool enable) { - TQObject *collection = TQT_TQOBJECT(CollectionList::instance()); + TQObject *collection = CollectionList::instance(); m_dirLister.disconnect(object()); if(enable) { - TQObject::connect(&m_dirLister, TQT_SIGNAL(newItems(const KFileItemList &)), - object(), TQT_SLOT(slotNewItems(const KFileItemList &))); - TQObject::connect(&m_dirLister, TQT_SIGNAL(refreshItems(const KFileItemList &)), - collection, TQT_SLOT(slotRefreshItems(const KFileItemList &))); - TQObject::connect(&m_dirLister, TQT_SIGNAL(deleteItem(KFileItem *)), - collection, TQT_SLOT(slotDeleteItem(KFileItem *))); + TQObject::connect(&m_dirLister, TQ_SIGNAL(newItems(const KFileItemList &)), + object(), TQ_SLOT(slotNewItems(const KFileItemList &))); + TQObject::connect(&m_dirLister, TQ_SIGNAL(refreshItems(const KFileItemList &)), + collection, TQ_SLOT(slotRefreshItems(const KFileItemList &))); + TQObject::connect(&m_dirLister, TQ_SIGNAL(deleteItem(KFileItem *)), + collection, TQ_SLOT(slotDeleteItem(KFileItem *))); } } @@ -789,7 +789,7 @@ Playlist *PlaylistCollection::playlistByName(const TQString &name) const TQObject *obj; for(obj = l->first(); obj; obj = l->next()) { - Playlist *p = static_cast<Playlist*>(TQT_TQWIDGET(obj)); + Playlist *p = static_cast<Playlist*>(obj); if(p->name() == name) { list = p; break; @@ -842,11 +842,11 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection) menu = new TDEActionMenu(i18n("&New"), "document-new", actions(), "file_new"); - menu->insert(createAction(i18n("&Empty Playlist..."), TQT_SLOT(slotCreatePlaylist()), + menu->insert(createAction(i18n("&Empty Playlist..."), TQ_SLOT(slotCreatePlaylist()), "newPlaylist", "window-new", "CTRL+n")); - menu->insert(createAction(i18n("&Search Playlist..."), TQT_SLOT(slotCreateSearchPlaylist()), + menu->insert(createAction(i18n("&Search Playlist..."), TQ_SLOT(slotCreateSearchPlaylist()), "newSearchPlaylist", "edit-find", "CTRL+f")); - menu->insert(createAction(i18n("Playlist From &Folder..."), TQT_SLOT(slotCreateFolderPlaylist()), + menu->insert(createAction(i18n("Playlist From &Folder..."), TQ_SLOT(slotCreateFolderPlaylist()), "newDirectoryPlaylist", "document-open", "CTRL+d")); // Guess tag info menu @@ -855,47 +855,47 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection) menu = new TDEActionMenu(i18n("&Guess Tag Information"), TQString(), actions(), "guessTag"); menu->setIconSet(SmallIconSet("wizard")); - menu->insert(createAction(i18n("From &File Name"), TQT_SLOT(slotGuessTagFromFile()), + menu->insert(createAction(i18n("From &File Name"), TQ_SLOT(slotGuessTagFromFile()), "guessTagFile", "fileimport", "CTRL+g")); - menu->insert(createAction(i18n("From &Internet"), TQT_SLOT(slotGuessTagFromInternet()), + menu->insert(createAction(i18n("From &Internet"), TQ_SLOT(slotGuessTagFromInternet()), "guessTagInternet", "connect_established", "CTRL+i")); #else - createAction(i18n("Guess Tag Information From &File Name"), TQT_SLOT(slotGuessTagFromFile()), + createAction(i18n("Guess Tag Information From &File Name"), TQ_SLOT(slotGuessTagFromFile()), "guessTag", "fileimport", "CTRL+f"); #endif - createAction(i18n("Play First Track"),TQT_SLOT(slotPlayFirst()), "playFirst"); - createAction(i18n("Play Next Album"), TQT_SLOT(slotPlayNextAlbum()), "forwardAlbum", "next"); + createAction(i18n("Play First Track"),TQ_SLOT(slotPlayFirst()), "playFirst"); + createAction(i18n("Play Next Album"), TQ_SLOT(slotPlayNextAlbum()), "forwardAlbum", "next"); - createAction(i18n("Open..."), TQT_SLOT(slotOpen()), "file_open", "document-open", "CTRL+o"); - createAction(i18n("Add &Folder..."), TQT_SLOT(slotAddFolder()), "openDirectory", "document-open"); - createAction(i18n("&Rename..."), TQT_SLOT(slotRename()), "renamePlaylist", "lineedit"); - createAction(i18n("D&uplicate..."), TQT_SLOT(slotDuplicate()), "duplicatePlaylist", "edit-copy"); - createAction(i18n("Save"), TQT_SLOT(slotSave()), "file_save", "document-save", "CTRL+s"); - createAction(i18n("Save As..."), TQT_SLOT(slotSaveAs()), "file_save_as", "document-save-as"); - createAction(i18n("R&emove"), TQT_SLOT(slotRemove()), "deleteItemPlaylist", "edittrash"); - createAction(i18n("Reload"), TQT_SLOT(slotReload()), "reloadPlaylist", "reload"); - createAction(i18n("Edit Search..."), TQT_SLOT(slotEditSearch()), "editSearch", "edit-clear"); + createAction(i18n("Open..."), TQ_SLOT(slotOpen()), "file_open", "document-open", "CTRL+o"); + createAction(i18n("Add &Folder..."), TQ_SLOT(slotAddFolder()), "openDirectory", "document-open"); + createAction(i18n("&Rename..."), TQ_SLOT(slotRename()), "renamePlaylist", "lineedit"); + createAction(i18n("D&uplicate..."), TQ_SLOT(slotDuplicate()), "duplicatePlaylist", "edit-copy"); + createAction(i18n("Save"), TQ_SLOT(slotSave()), "file_save", "document-save", "CTRL+s"); + createAction(i18n("Save As..."), TQ_SLOT(slotSaveAs()), "file_save_as", "document-save-as"); + createAction(i18n("R&emove"), TQ_SLOT(slotRemove()), "deleteItemPlaylist", "edittrash"); + createAction(i18n("Reload"), TQ_SLOT(slotReload()), "reloadPlaylist", "reload"); + createAction(i18n("Edit Search..."), TQ_SLOT(slotEditSearch()), "editSearch", "edit-clear"); - createAction(i18n("&Delete"), TQT_SLOT(slotRemoveItems()), "removeItem", "edit-delete"); - createAction(i18n("Refresh"), TQT_SLOT(slotRefreshItems()), "refresh", "reload"); - createAction(i18n("&Rename File"), TQT_SLOT(slotRenameItems()), "renameFile", "document-save-as", "CTRL+r"); + createAction(i18n("&Delete"), TQ_SLOT(slotRemoveItems()), "removeItem", "edit-delete"); + createAction(i18n("Refresh"), TQ_SLOT(slotRefreshItems()), "refresh", "reload"); + createAction(i18n("&Rename File"), TQ_SLOT(slotRenameItems()), "renameFile", "document-save-as", "CTRL+r"); menu = new TDEActionMenu(i18n("Cover Manager"), TQString(), actions(), "coverManager"); menu->setIconSet(SmallIconSet("image-x-generic")); menu->insert(createAction(i18n("&View Cover"), - TQT_SLOT(slotViewCovers()), "viewCover", "viewmag")); + TQ_SLOT(slotViewCovers()), "viewCover", "viewmag")); menu->insert(createAction(i18n("Get Cover From &File..."), - TQT_SLOT(slotAddLocalCover()), "addCover", "fileimport", "CTRL+SHIFT+f")); + TQ_SLOT(slotAddLocalCover()), "addCover", "fileimport", "CTRL+SHIFT+f")); // Do not rename googleCover for backward compatibility menu->insert(createAction(i18n("Get Cover From &Internet..."), - TQT_SLOT(slotAddInternetCover()), "googleCover", "connect_established", "CTRL+SHIFT+g")); + TQ_SLOT(slotAddInternetCover()), "googleCover", "connect_established", "CTRL+SHIFT+g")); menu->insert(createAction(i18n("&Delete Cover"), - TQT_SLOT(slotRemoveCovers()), "removeCover", "edit-delete")); + TQ_SLOT(slotRemoveCovers()), "removeCover", "edit-delete")); menu->insert(createAction(i18n("Show Cover &Manager"), - TQT_SLOT(slotShowCoverManager()), "showCoverManager")); + TQ_SLOT(slotShowCoverManager()), "showCoverManager")); TDEToggleAction *historyAction = new TDEToggleAction(i18n("Show &History"), "history", 0, actions(), "showHistory"); @@ -905,10 +905,10 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection) new TDEToggleAction(i18n("Show &Play Queue"), "today", 0, actions(), "showUpcoming"); upcomingAction->setCheckedState(i18n("Hide &Play Queue")); - connect(action<TDEToggleAction>("showHistory"), TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSetHistoryPlaylistEnabled(bool))); - connect(action<TDEToggleAction>("showUpcoming"), TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSetUpcomingPlaylistEnabled(bool))); + connect(action<TDEToggleAction>("showHistory"), TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSetHistoryPlaylistEnabled(bool))); + connect(action<TDEToggleAction>("showUpcoming"), TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSetUpcomingPlaylistEnabled(bool))); } TDEAction *PlaylistCollection::ActionHandler::createAction(const TQString &text, diff --git a/juk/playlistsplitter.cpp b/juk/playlistsplitter.cpp index 17da7a07..d1eff928 100644 --- a/juk/playlistsplitter.cpp +++ b/juk/playlistsplitter.cpp @@ -121,7 +121,7 @@ void PlaylistSplitter::setupActions() new TDEToggleAction(i18n("Show &Search Bar"), "filefind", 0, ActionCollection::actions(), "showSearch"); showSearch->setCheckedState(i18n("Hide &Search Bar")); - new TDEAction(i18n("Edit Track Search"), "edit_clear", "F6", TQT_TQOBJECT(this), TQT_SLOT(setFocus()), ActionCollection::actions(), "editTrackSearch"); + new TDEAction(i18n("Edit Track Search"), "edit_clear", "F6", this, TQ_SLOT(setFocus()), ActionCollection::actions(), "editTrackSearch"); } void PlaylistSplitter::setupLayout() @@ -140,7 +140,7 @@ void PlaylistSplitter::setupLayout() m_playlistStack = new TQWidgetStack(top, "playlistStack"); m_playlistStack->installEventFilter(this); - connect(m_playlistStack, TQT_SIGNAL(aboutToShow(TQWidget *)), this, TQT_SLOT(slotPlaylistChanged(TQWidget *))); + connect(m_playlistStack, TQ_SIGNAL(aboutToShow(TQWidget *)), this, TQ_SLOT(slotPlaylistChanged(TQWidget *))); m_editor = new TagEditor(editorSplitter, "tagEditor"); @@ -152,31 +152,31 @@ void PlaylistSplitter::setupLayout() m_playlistBox = new PlaylistBox(this, m_playlistStack, "playlistBox"); - connect(m_playlistBox->object(), TQT_SIGNAL(signalSelectedItemsChanged()), - this, TQT_SLOT(slotPlaylistSelectionChanged())); - connect(m_playlistBox, TQT_SIGNAL(signalPlaylistDestroyed(Playlist *)), - m_editor, TQT_SLOT(slotPlaylistDestroyed(Playlist *))); + connect(m_playlistBox->object(), TQ_SIGNAL(signalSelectedItemsChanged()), + this, TQ_SLOT(slotPlaylistSelectionChanged())); + connect(m_playlistBox, TQ_SIGNAL(signalPlaylistDestroyed(Playlist *)), + m_editor, TQ_SLOT(slotPlaylistDestroyed(Playlist *))); moveToFirst(m_playlistBox); - connect(CollectionList::instance(), TQT_SIGNAL(signalCollectionChanged()), - m_editor, TQT_SLOT(slotUpdateCollection())); + connect(CollectionList::instance(), TQ_SIGNAL(signalCollectionChanged()), + m_editor, TQ_SLOT(slotUpdateCollection())); NowPlaying *nowPlaying = new NowPlaying(top, m_playlistBox); // Create the search widget -- this must be done after the CollectionList is created. m_searchWidget = new SearchWidget(top, "searchWidget"); - connect(m_searchWidget, TQT_SIGNAL(signalQueryChanged()), - this, TQT_SLOT(slotShowSearchResults())); - connect(m_searchWidget, TQT_SIGNAL(signalDownPressed()), - this, TQT_SLOT(slotFocusCurrentPlaylist())); - connect(m_searchWidget, TQT_SIGNAL(signalAdvancedSearchClicked()), - m_playlistBox->object(), TQT_SLOT(slotCreateSearchPlaylist())); - connect(m_searchWidget, TQT_SIGNAL(signalShown(bool)), - m_playlistBox->object(), TQT_SLOT(slotSetSearchEnabled(bool))); - connect(action<TDEToggleAction>("showSearch"), TQT_SIGNAL(toggled(bool)), - m_searchWidget, TQT_SLOT(setEnabled(bool))); + connect(m_searchWidget, TQ_SIGNAL(signalQueryChanged()), + this, TQ_SLOT(slotShowSearchResults())); + connect(m_searchWidget, TQ_SIGNAL(signalDownPressed()), + this, TQ_SLOT(slotFocusCurrentPlaylist())); + connect(m_searchWidget, TQ_SIGNAL(signalAdvancedSearchClicked()), + m_playlistBox->object(), TQ_SLOT(slotCreateSearchPlaylist())); + connect(m_searchWidget, TQ_SIGNAL(signalShown(bool)), + m_playlistBox->object(), TQ_SLOT(slotSetSearchEnabled(bool))); + connect(action<TDEToggleAction>("showSearch"), TQ_SIGNAL(toggled(bool)), + m_searchWidget, TQ_SLOT(setEnabled(bool))); topLayout->addWidget(nowPlaying); topLayout->addWidget(m_searchWidget); diff --git a/juk/searchwidget.cpp b/juk/searchwidget.cpp index 19e98c33..de6a1aa8 100644 --- a/juk/searchwidget.cpp +++ b/juk/searchwidget.cpp @@ -48,24 +48,24 @@ SearchLine::SearchLine(TQWidget *parent, bool simple, const char *name) : if(!m_simple) { m_searchFieldsBox = new KComboBox(this, "searchFields"); - connect(m_searchFieldsBox, TQT_SIGNAL(activated(int)), - this, TQT_SIGNAL(signalQueryChanged())); + connect(m_searchFieldsBox, TQ_SIGNAL(activated(int)), + this, TQ_SIGNAL(signalQueryChanged())); } m_lineEdit = new KLineEdit(this, "searchLineEdit"); m_lineEdit->installEventFilter(this); - connect(m_lineEdit, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SIGNAL(signalQueryChanged())); - connect(m_lineEdit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotActivate())); + connect(m_lineEdit, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SIGNAL(signalQueryChanged())); + connect(m_lineEdit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotActivate())); if(!m_simple) { m_caseSensitive = new KComboBox(this); m_caseSensitive->insertItem(i18n("Normal Matching"), 0); m_caseSensitive->insertItem(i18n("Case Sensitive"), 1); m_caseSensitive->insertItem(i18n("Pattern Matching"), 2); - connect(m_caseSensitive, TQT_SIGNAL(activated(int)), - this, TQT_SIGNAL(signalQueryChanged())); + connect(m_caseSensitive, TQ_SIGNAL(activated(int)), + this, TQ_SIGNAL(signalQueryChanged())); } else m_caseSensitive = 0; @@ -273,9 +273,9 @@ void SearchWidget::setupLayout() label->setBuddy(m_searchLine); - connect(m_searchLine, TQT_SIGNAL(signalQueryChanged()), this, TQT_SIGNAL(signalQueryChanged())); - connect(m_searchLine, TQT_SIGNAL(signalDownPressed()), this, TQT_SIGNAL(signalDownPressed())); - connect(clearSearchButton, TQT_SIGNAL(pressed()), m_searchLine, TQT_SLOT(clear())); + connect(m_searchLine, TQ_SIGNAL(signalQueryChanged()), this, TQ_SIGNAL(signalQueryChanged())); + connect(m_searchLine, TQ_SIGNAL(signalDownPressed()), this, TQ_SIGNAL(signalDownPressed())); + connect(clearSearchButton, TQ_SIGNAL(pressed()), m_searchLine, TQ_SLOT(clear())); setStretchableWidget(m_searchLine); // I've decided that I think this is ugly, for now. @@ -285,7 +285,7 @@ void SearchWidget::setupLayout() b->setTextLabel(i18n("Advanced Search"), true); b->setIconSet(SmallIconSet("wizard")); - connect(b, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(signalAdvancedSearchClicked())); + connect(b, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(signalAdvancedSearchClicked())); */ } diff --git a/juk/slideraction.cpp b/juk/slideraction.cpp index b632282e..f16b21eb 100644 --- a/juk/slideraction.cpp +++ b/juk/slideraction.cpp @@ -66,7 +66,7 @@ protected: VolumeSlider::VolumeSlider(TQt::Orientation o, TQWidget *parent, const char *name) : TQSlider(o, parent, name) { - connect(this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged(int))); + connect(this, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotValueChanged(int))); } void VolumeSlider::wheelEvent(TQWheelEvent *e) @@ -162,11 +162,11 @@ int SliderAction::plug(TQWidget *parent, int index) addContainer(m_toolBar, id); - connect(m_toolBar, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotToolbarDestroyed())); - connect(m_toolBar, TQT_SIGNAL(orientationChanged(TQt::Orientation)), - this, TQT_SLOT(slotUpdateOrientation())); - connect(m_toolBar, TQT_SIGNAL(placeChanged(TQDockWindow::Place)), - this, TQT_SLOT(slotUpdateOrientation())); + connect(m_toolBar, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotToolbarDestroyed())); + connect(m_toolBar, TQ_SIGNAL(orientationChanged(TQt::Orientation)), + this, TQ_SLOT(slotUpdateOrientation())); + connect(m_toolBar, TQ_SIGNAL(placeChanged(TQDockWindow::Place)), + this, TQ_SLOT(slotUpdateOrientation())); slotUpdateOrientation(); return (containerCount() - 1); @@ -254,8 +254,8 @@ TQWidget *SliderAction::createWidget(TQWidget *parent) // virtual -- used by bas m_trackPositionSlider->setMaxValue(maxPosition); TQToolTip::add(m_trackPositionSlider, i18n("Track position")); m_layout->addWidget(m_trackPositionSlider); - connect(m_trackPositionSlider, TQT_SIGNAL(sliderPressed()), this, TQT_SLOT(slotSliderPressed())); - connect(m_trackPositionSlider, TQT_SIGNAL(sliderReleased()), this, TQT_SLOT(slotSliderReleased())); + connect(m_trackPositionSlider, TQ_SIGNAL(sliderPressed()), this, TQ_SLOT(slotSliderPressed())); + connect(m_trackPositionSlider, TQ_SIGNAL(sliderReleased()), this, TQ_SLOT(slotSliderReleased())); m_layout->addItem(new TQSpacerItem(10, 1)); @@ -269,9 +269,9 @@ TQWidget *SliderAction::createWidget(TQWidget *parent) // virtual -- used by bas m_volumeSlider->setMaxValue(100); TQToolTip::add(m_volumeSlider, i18n("Volume")); m_layout->addWidget(m_volumeSlider); - connect(m_volumeSlider, TQT_SIGNAL(signalVolumeChanged(int)), TQT_SIGNAL(signalVolumeChanged(int))); - connect(m_volumeSlider, TQT_SIGNAL(sliderPressed()), this, TQT_SLOT(slotVolumeSliderPressed())); - connect(m_volumeSlider, TQT_SIGNAL(sliderReleased()), this, TQT_SLOT(slotVolumeSliderReleased())); + connect(m_volumeSlider, TQ_SIGNAL(signalVolumeChanged(int)), TQ_SIGNAL(signalVolumeChanged(int))); + connect(m_volumeSlider, TQ_SIGNAL(sliderPressed()), this, TQ_SLOT(slotVolumeSliderPressed())); + connect(m_volumeSlider, TQ_SIGNAL(sliderReleased()), this, TQ_SLOT(slotVolumeSliderReleased())); m_volumeSlider->setName("tde toolbar widget"); m_trackPositionSlider->setName("tde toolbar widget"); @@ -279,7 +279,7 @@ TQWidget *SliderAction::createWidget(TQWidget *parent) // virtual -- used by bas m_layout->setStretchFactor(m_trackPositionSlider, 4); m_layout->setStretchFactor(m_volumeSlider, 1); - connect(parent, TQT_SIGNAL(modechange()), this, TQT_SLOT(slotUpdateSize())); + connect(parent, TQ_SIGNAL(modechange()), this, TQ_SLOT(slotUpdateSize())); return base; } diff --git a/juk/splashscreen.cpp b/juk/splashscreen.cpp index ae72f05b..94488e7e 100644 --- a/juk/splashscreen.cpp +++ b/juk/splashscreen.cpp @@ -16,7 +16,7 @@ #include <tdeapplication.h> #include <kiconloader.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tqpainter.h> @@ -100,5 +100,5 @@ SplashScreen::~SplashScreen() void SplashScreen::processEvents() { setText(loadedText(count)); - kapp->processEvents(); + tdeApp->processEvents(); } diff --git a/juk/statuslabel.cpp b/juk/statuslabel.cpp index a590362c..1aea48b5 100644 --- a/juk/statuslabel.cpp +++ b/juk/statuslabel.cpp @@ -85,7 +85,7 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const ch jumpButton->setFlat(true); TQToolTip::add(jumpButton, i18n("Jump to the currently playing item")); - connect(jumpButton, TQT_SIGNAL(clicked()), action("showPlaying"), TQT_SLOT(activate())); + connect(jumpButton, TQ_SIGNAL(clicked()), action("showPlaying"), TQ_SLOT(activate())); installEventFilter(this); diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp index ae3aee32..2e46272e 100644 --- a/juk/systemtray.cpp +++ b/juk/systemtray.cpp @@ -97,7 +97,7 @@ PassiveInfo::PassiveInfo(TQWidget *parent, const char *name) : // that I'll just handle the timeout myself, thank you very much. KPassivePopup::setTimeout(0); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(timerExpired())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(timerExpired())); } void PassiveInfo::setTimeout(int delay) @@ -162,14 +162,14 @@ SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent, // Just create this here so that it show up in the DCOP interface and the key // bindings dialog. - new TDEAction(i18n("Redisplay Popup"), TDEShortcut(), TQT_TQOBJECT(this), - TQT_SLOT(slotPlay()), ActionCollection::actions(), "showPopup"); + new TDEAction(i18n("Redisplay Popup"), TDEShortcut(), this, + TQ_SLOT(slotPlay()), ActionCollection::actions(), "showPopup"); TDEPopupMenu *cm = contextMenu(); - connect(PlayerManager::instance(), TQT_SIGNAL(signalPlay()), this, TQT_SLOT(slotPlay())); - connect(PlayerManager::instance(), TQT_SIGNAL(signalPause()), this, TQT_SLOT(slotPause())); - connect(PlayerManager::instance(), TQT_SIGNAL(signalStop()), this, TQT_SLOT(slotStop())); + connect(PlayerManager::instance(), TQ_SIGNAL(signalPlay()), this, TQ_SLOT(slotPlay())); + connect(PlayerManager::instance(), TQ_SIGNAL(signalPause()), this, TQ_SLOT(slotPause())); + connect(PlayerManager::instance(), TQ_SIGNAL(signalStop()), this, TQ_SLOT(slotStop())); action("play")->plug(cm); action("pause")->plug(cm); @@ -181,7 +181,7 @@ SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent, // Pity the actionCollection doesn't keep track of what sub-menus it has. - TDEActionMenu *menu = new TDEActionMenu(i18n("&Random Play"), TQT_TQOBJECT(this)); + TDEActionMenu *menu = new TDEActionMenu(i18n("&Random Play"), this); menu->insert(action("disableRandomPlay")); menu->insert(action("randomPlay")); menu->insert(action("albumRandomPlay")); @@ -190,7 +190,7 @@ SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent, action("togglePopups")->plug(cm); m_fadeTimer = new TQTimer(this, "systrayFadeTimer"); - connect(m_fadeTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotNextStep())); + connect(m_fadeTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotNextStep())); if(PlayerManager::instance()->playing()) slotPlay(); @@ -278,8 +278,8 @@ void SystemTray::slotFadeOut() m_startColor = m_labels[0]->textColor(); m_endColor = m_labels[0]->backgroundColor(); - connect(this, TQT_SIGNAL(fadeDone()), m_popup, TQT_SLOT(hide())); - connect(m_popup, TQT_SIGNAL(mouseEntered()), this, TQT_SLOT(slotMouseInPopup())); + connect(this, TQ_SIGNAL(fadeDone()), m_popup, TQ_SLOT(hide())); + connect(m_popup, TQ_SIGNAL(mouseEntered()), this, TQ_SLOT(slotMouseInPopup())); m_fadeTimer->start(1500 / STEPS); } @@ -289,7 +289,7 @@ void SystemTray::slotFadeOut() void SystemTray::slotMouseInPopup() { m_endColor = m_labels[0]->textColor(); - disconnect(TQT_SIGNAL(fadeDone())); + disconnect(TQ_SIGNAL(fadeDone())); m_step = STEPS - 1; // Simulate end of fade to solid text slotNextStep(); @@ -360,8 +360,8 @@ void SystemTray::createPopup() m_step = 0; m_popup = new PassiveInfo(this); - connect(m_popup, TQT_SIGNAL(destroyed()), TQT_SLOT(slotPopupDestroyed())); - connect(m_popup, TQT_SIGNAL(timeExpired()), TQT_SLOT(slotFadeOut())); + connect(m_popup, TQ_SIGNAL(destroyed()), TQ_SLOT(slotPopupDestroyed())); + connect(m_popup, TQ_SIGNAL(timeExpired()), TQ_SLOT(slotFadeOut())); TQHBox *box = new TQHBox(m_popup, "popupMainLayout"); box->setSpacing(15); // Add space between text and buttons @@ -448,11 +448,11 @@ void SystemTray::createButtonBox(TQWidget *parent) TQPushButton *forwardButton = new TQPushButton(m_forwardPix, 0, buttonBox, "popup_forward"); forwardButton->setFlat(true); - connect(forwardButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotForward())); + connect(forwardButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotForward())); TQPushButton *backButton = new TQPushButton(m_backPix, 0, buttonBox, "popup_back"); backButton->setFlat(true); - connect(backButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotBack())); + connect(backButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotBack())); } /** @@ -491,7 +491,7 @@ void SystemTray::addCoverButton(TQWidget *parent, const TQPixmap &cover) coverButton->setFixedSize(cover.size()); coverButton->setFlat(true); - connect(coverButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPopupLargeCover())); + connect(coverButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPopupLargeCover())); } TQColor SystemTray::interpolateColor(int step, int steps) diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp index c1200e3d..e4bbfffc 100644 --- a/juk/tageditor.cpp +++ b/juk/tageditor.cpp @@ -174,8 +174,8 @@ void TagEditor::slotSetItems(const PlaylistItemList &list) saveChangesPrompt(); if(m_currentPlaylist) { - disconnect(m_currentPlaylist, TQT_SIGNAL(signalAboutToRemove(PlaylistItem *)), - this, TQT_SLOT(slotItemRemoved(PlaylistItem *))); + disconnect(m_currentPlaylist, TQ_SIGNAL(signalAboutToRemove(PlaylistItem *)), + this, TQ_SLOT(slotItemRemoved(PlaylistItem *))); } if(hadPlaylist && !m_currentPlaylist || !itemPlaylist) { @@ -191,9 +191,9 @@ void TagEditor::slotSetItems(const PlaylistItemList &list) } if(m_currentPlaylist) { - connect(m_currentPlaylist, TQT_SIGNAL(signalAboutToRemove(PlaylistItem *)), - this, TQT_SLOT(slotItemRemoved(PlaylistItem *))); - connect(m_currentPlaylist, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotPlaylistRemoved())); + connect(m_currentPlaylist, TQ_SIGNAL(signalAboutToRemove(PlaylistItem *)), + this, TQ_SLOT(slotItemRemoved(PlaylistItem *))); + connect(m_currentPlaylist, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotPlaylistRemoved())); } if(isVisible()) @@ -473,9 +473,9 @@ void TagEditor::setupActions() { TDEToggleAction *show = new TDEToggleAction(i18n("Show &Tag Editor"), "edit", 0, ActionCollection::actions(), "showEditor"); show->setCheckedState(i18n("Hide &Tag Editor")); - connect(show, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShown(bool))); + connect(show, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setShown(bool))); - new TDEAction(i18n("&Save"), "document-save", "CTRL+t", TQT_TQOBJECT(this), TQT_SLOT(slotSave()), ActionCollection::actions(), "saveItem"); + new TDEAction(i18n("&Save"), "document-save", "CTRL+t", this, TQ_SLOT(slotSave()), ActionCollection::actions(), "saveItem"); } void TagEditor::setupLayout() @@ -526,7 +526,7 @@ void TagEditor::setupLayout() horizontalSpacing); m_fileNameBox = new KLineEdit(this, "fileNameBox"); - m_fileNameBox->setValidator(new FileNameValidator(TQT_TQOBJECT(m_fileNameBox))); + m_fileNameBox->setValidator(new FileNameValidator(m_fileNameBox)); TQLabel *fileNameIcon = new TQLabel(this); fileNameIcon->setPixmap(SmallIcon("audio-x-generic")); @@ -588,32 +588,32 @@ void TagEditor::setupLayout() } - connect(m_artistNameBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotDataChanged())); + connect(m_artistNameBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotDataChanged())); - connect(m_trackNameBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotDataChanged())); + connect(m_trackNameBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotDataChanged())); - connect(m_albumNameBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotDataChanged())); + connect(m_albumNameBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotDataChanged())); - connect(m_genreBox, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotDataChanged())); + connect(m_genreBox, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotDataChanged())); - connect(m_genreBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotDataChanged())); + connect(m_genreBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotDataChanged())); - connect(m_fileNameBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotDataChanged())); + connect(m_fileNameBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotDataChanged())); - connect(m_yearSpin, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotDataChanged())); + connect(m_yearSpin, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotDataChanged())); - connect(m_trackSpin, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotDataChanged())); + connect(m_trackSpin, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotDataChanged())); - connect(m_commentBox, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(slotDataChanged())); + connect(m_commentBox, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(slotDataChanged())); } void TagEditor::save(const PlaylistItemList &list) @@ -636,7 +636,7 @@ void TagEditor::save(const PlaylistItemList &list) // playlists will try to modify the file we edit if the tag changes // due to our alterations here. - kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput); + tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput); PlaylistItem *item = *it; @@ -752,7 +752,7 @@ void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *layou enableBox->hide(); - connect(enableBox, TQT_SIGNAL(toggled(bool)), item, TQT_SLOT(setEnabled(bool))); + connect(enableBox, TQ_SIGNAL(toggled(bool)), item, TQ_SLOT(setEnabled(bool))); m_enableBoxes.insert(item, enableBox); } diff --git a/juk/tagguesser.cpp b/juk/tagguesser.cpp index 146f2ecb..3fe3db7f 100644 --- a/juk/tagguesser.cpp +++ b/juk/tagguesser.cpp @@ -150,7 +150,7 @@ TQStringList TagGuesser::schemeStrings() void TagGuesser::setSchemeStrings(const TQStringList &schemes) { - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); { TDEConfigGroupSaver saver(cfg, "TagGuesser"); cfg->writeEntry("Filename schemes", schemes); diff --git a/juk/tagguesserconfigdlg.cpp b/juk/tagguesserconfigdlg.cpp index b5ceaac9..201e2215 100644 --- a/juk/tagguesserconfigdlg.cpp +++ b/juk/tagguesserconfigdlg.cpp @@ -41,15 +41,15 @@ TagGuesserConfigDlg::TagGuesserConfigDlg(TQWidget *parent, const char *name) item->moveItem(m_child->lvSchemes->lastItem()); } - connect(m_child->lvSchemes, TQT_SIGNAL(currentChanged(TQListViewItem *)), - this, TQT_SLOT(slotCurrentChanged(TQListViewItem *))); - connect(m_child->lvSchemes, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(slotRenameItem(TQListViewItem *, const TQPoint &, int))); - connect(m_child->bMoveUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveUpClicked())); - connect(m_child->bMoveDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveDownClicked())); - connect(m_child->bAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddClicked())); - connect(m_child->bModify, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotModifyClicked())); - connect(m_child->bRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveClicked())); + connect(m_child->lvSchemes, TQ_SIGNAL(currentChanged(TQListViewItem *)), + this, TQ_SLOT(slotCurrentChanged(TQListViewItem *))); + connect(m_child->lvSchemes, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(slotRenameItem(TQListViewItem *, const TQPoint &, int))); + connect(m_child->bMoveUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveUpClicked())); + connect(m_child->bMoveDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveDownClicked())); + connect(m_child->bAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddClicked())); + connect(m_child->bModify, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotModifyClicked())); + connect(m_child->bRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveClicked())); m_child->lvSchemes->setSelected(m_child->lvSchemes->firstChild(), true); slotCurrentChanged(m_child->lvSchemes->currentItem()); diff --git a/juk/tagtransactionmanager.cpp b/juk/tagtransactionmanager.cpp index c816f2f4..ee1bd7ca 100644 --- a/juk/tagtransactionmanager.cpp +++ b/juk/tagtransactionmanager.cpp @@ -135,7 +135,7 @@ bool TagTransactionManager::renameFile(const TQFileInfo &from, const TQFileInfo if(!to.exists() || KMessageBox::warningContinueCancel( - TQT_TQWIDGET(parent()), + static_cast<TQWidget*>(parent()), i18n("This file already exists.\nDo you want to replace it?"), i18n("File Exists"),i18n("Replace")) == KMessageBox::Continue) { @@ -190,7 +190,7 @@ bool TagTransactionManager::processChangeList(bool undo) errorItems.append(str); } - kapp->processEvents(); + tdeApp->processEvents(); } undo ? m_undoList.clear() : m_list.clear(); @@ -200,7 +200,7 @@ bool TagTransactionManager::processChangeList(bool undo) action("edit_undo")->setEnabled(false); if(!errorItems.isEmpty()) - KMessageBox::errorList(TQT_TQWIDGET(parent()), + KMessageBox::errorList(static_cast<TQWidget*>(parent()), i18n("The following files were unable to be changed."), errorItems, i18n("Error")); diff --git a/juk/trackpickerdialog.cpp b/juk/trackpickerdialog.cpp index 892b2156..f02d43fd 100644 --- a/juk/trackpickerdialog.cpp +++ b/juk/trackpickerdialog.cpp @@ -61,8 +61,8 @@ TrackPickerDialog::TrackPickerDialog(const TQString &name, m_base->trackList->setSelected(m_base->trackList->firstChild(), true); - connect(m_base->trackList, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(accept())); + connect(m_base->trackList, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(accept())); setMinimumWidth(kMax(400, width())); } diff --git a/juk/tracksequencemanager.cpp b/juk/tracksequencemanager.cpp index 86f88f96..34076bf7 100644 --- a/juk/tracksequencemanager.cpp +++ b/juk/tracksequencemanager.cpp @@ -121,8 +121,8 @@ void TrackSequenceManager::setCurrentPlaylist(Playlist *list) m_playlist->disconnect(this); m_playlist = list; - connect(m_playlist, TQT_SIGNAL(signalAboutToRemove(PlaylistItem *)), - this, TQT_SLOT(slotItemAboutToDie(PlaylistItem *))); + connect(m_playlist, TQ_SIGNAL(signalAboutToRemove(PlaylistItem *)), + this, TQ_SLOT(slotItemAboutToDie(PlaylistItem *))); } void TrackSequenceManager::setCurrent(PlaylistItem *item) @@ -148,8 +148,8 @@ void TrackSequenceManager::initialize() return; // Make sure we don't use m_playNextItem if it's invalid. - connect(collection, TQT_SIGNAL(signalAboutToRemove(PlaylistItem *)), - this, TQT_SLOT(slotItemAboutToDie(PlaylistItem *))); + connect(collection, TQ_SIGNAL(signalAboutToRemove(PlaylistItem *)), + this, TQ_SLOT(slotItemAboutToDie(PlaylistItem *))); m_initialized = true; } diff --git a/juk/viewmode.cpp b/juk/viewmode.cpp index 040bf3a3..339376ae 100644 --- a/juk/viewmode.cpp +++ b/juk/viewmode.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tqpixmap.h> diff --git a/juk/webimagefetcher.cpp b/juk/webimagefetcher.cpp index 142b1eb9..024169bb 100644 --- a/juk/webimagefetcher.cpp +++ b/juk/webimagefetcher.cpp @@ -48,7 +48,7 @@ WebImageFetcher::WebImageFetcher(TQObject *parent) m_connectionId(-1), m_dialog(0) { - connect(m_connection, TQT_SIGNAL(requestFinished(int,bool)), TQT_SLOT(slotWebRequestFinished(int,bool))); + connect(m_connection, TQ_SIGNAL(requestFinished(int,bool)), TQ_SLOT(slotWebRequestFinished(int,bool))); } WebImageFetcher::~WebImageFetcher() @@ -173,8 +173,8 @@ void WebImageFetcher::slotWebRequestFinished(int id, bool error) m_dialog = new WebImageFetcherDialog(m_imageList, m_file, 0); m_dialog->setModal(true); - connect(m_dialog, TQT_SIGNAL(coverSelected()), TQT_SLOT(slotCoverChosen())); - connect(m_dialog, TQT_SIGNAL(newSearchRequested()), TQT_SLOT(slotNewSearch())); + connect(m_dialog, TQ_SIGNAL(coverSelected()), TQ_SLOT(slotCoverChosen())); + connect(m_dialog, TQ_SIGNAL(newSearchRequested()), TQ_SLOT(slotNewSearch())); } m_dialog->refreshScreen(m_imageList); @@ -201,7 +201,7 @@ void WebImageFetcher::slotNewSearch() void WebImageFetcher::displayWaitMessage() { - KStatusBar *statusBar = static_cast<TDEMainWindow *>(kapp->mainWidget())->statusBar(); + KStatusBar *statusBar = static_cast<TDEMainWindow *>(tdeApp->mainWidget())->statusBar(); statusBar->message(i18n("Searching for Images. Please Wait...")); slotLoadImageURLs(); statusBar->clear(); diff --git a/juk/webimagefetcherdialog.cpp b/juk/webimagefetcherdialog.cpp index 9f6c9744..535177cf 100644 --- a/juk/webimagefetcherdialog.cpp +++ b/juk/webimagefetcherdialog.cpp @@ -55,8 +55,8 @@ WebImageFetcherDialog::WebImageFetcherDialog(const WebImageList &imageList, m_iconWidget->arrangeItemsInGrid(); m_iconWidget->setItemsMovable(false); mainLayout->addWidget(m_iconWidget); - connect(m_iconWidget, TQT_SIGNAL(executed(TQIconViewItem *)), - this, TQT_SLOT(slotOk())); + connect(m_iconWidget, TQ_SIGNAL(executed(TQIconViewItem *)), + this, TQ_SLOT(slotOk())); // Before changing the code below be sure to check the attribution terms // of the Yahoo Image Search API. @@ -66,8 +66,8 @@ WebImageFetcherDialog::WebImageFetcherDialog(const WebImageList &imageList, logoLabel->setPixmap(UserIcon("yahoo_credit")); logoLabel->setMargin(15); // Allow large margin per attribution terms. logoLabel->setUseTips(true); // Show URL in tooltip. - connect(logoLabel, TQT_SIGNAL(leftClickedURL(const TQString &)), - TQT_SLOT(showCreditURL(const TQString &))); + connect(logoLabel, TQ_SIGNAL(leftClickedURL(const TQString &)), + TQ_SLOT(showCreditURL(const TQString &))); TQBoxLayout *creditLayout = new TQHBoxLayout(mainLayout); creditLayout->addStretch(); // Left spacer @@ -197,9 +197,9 @@ CoverIconViewItem::CoverIconViewItem(TQIconView *parent, const WebImage &image) // Start downloading the image. m_job = TDEIO::get(image.thumbURL(), false, false); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(imageResult(TDEIO::Job *))); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(imageData(TDEIO::Job *, const TQByteArray &))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(imageResult(TDEIO::Job *))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(imageData(TDEIO::Job *, const TQByteArray &))); } CoverIconViewItem::~CoverIconViewItem() @@ -209,7 +209,7 @@ CoverIconViewItem::~CoverIconViewItem() // Drain results issued by TDEIO before being deleted, // and before deleting the job. - kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput); + tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput); delete m_job; } 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() diff --git a/kaudiocreator/cdconfig.ui b/kaudiocreator/cdconfig.ui index c0756c83..50133562 100644 --- a/kaudiocreator/cdconfig.ui +++ b/kaudiocreator/cdconfig.ui @@ -54,8 +54,8 @@ </spacer> </vbox> </widget> -<Q_SLOTS> +<slots> <slot access="protected" specifier="non virtual">configureAudioCD()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaudiocreator/encodefileimp.cpp b/kaudiocreator/encodefileimp.cpp index 75f79736..28bc688a 100644 --- a/kaudiocreator/encodefileimp.cpp +++ b/kaudiocreator/encodefileimp.cpp @@ -33,8 +33,8 @@ EncodeFileImp::EncodeFileImp(TQWidget* parent, // Specify to only accept wav files file->setFilter("*.wav|Wav Files"); - connect(file,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(enableEncodeButton(const TQString &))); - connect(encodeButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(encode())); + connect(file,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(enableEncodeButton(const TQString &))); + connect(encodeButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(encode())); } /** diff --git a/kaudiocreator/encoder.cpp b/kaudiocreator/encoder.cpp index 9cc729a6..2bd14870 100644 --- a/kaudiocreator/encoder.cpp +++ b/kaudiocreator/encoder.cpp @@ -26,7 +26,7 @@ #include <tqregexp.h> #include <tqdir.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <kurl.h> #include <kdebug.h> @@ -212,11 +212,11 @@ void Encoder::tendToNewJobs() { proc->setPriority(Prefs::niceLevel()); *proc << TQFile::encodeName(command).data(); - connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )), - this, TQT_SLOT(receivedThreadOutput(TDEProcess *, char *, int ))); - connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int )), - this, TQT_SLOT(receivedThreadOutput(TDEProcess *, char *, int ))); - connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(jobDone(TDEProcess *))); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this, TQ_SLOT(receivedThreadOutput(TDEProcess *, char *, int ))); + connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int )), + this, TQ_SLOT(receivedThreadOutput(TDEProcess *, char *, int ))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(jobDone(TDEProcess *))); jobs.insert(proc, job); threads.append(proc); diff --git a/kaudiocreator/encoder.h b/kaudiocreator/encoder.h index fdc7bb53..281be620 100644 --- a/kaudiocreator/encoder.h +++ b/kaudiocreator/encoder.h @@ -26,7 +26,7 @@ #include <tqptrlist.h> #include <tqmap.h> #include "job.h" -#include <kprocess.h> +#include <tdeprocess.h> class EncoderPrefs; diff --git a/kaudiocreator/encoderconfig.ui b/kaudiocreator/encoderconfig.ui index 66a3daaa..338bac68 100644 --- a/kaudiocreator/encoderconfig.ui +++ b/kaudiocreator/encoderconfig.ui @@ -286,8 +286,8 @@ <includes> <include location="local" impldecl="in implementation">encoderconfig.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>encoderWizard()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaudiocreator/encoderconfigimp.cpp b/kaudiocreator/encoderconfigimp.cpp index 2865dce3..e2ca1188 100644 --- a/kaudiocreator/encoderconfigimp.cpp +++ b/kaudiocreator/encoderconfigimp.cpp @@ -34,10 +34,10 @@ */ EncoderConfigImp::EncoderConfigImp( TQWidget* parent, const char* name) : EncoderConfig (parent, name) { - connect(addEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(addEncoderSlot())); - connect(removeEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeEncoderSlot())); - connect(configureEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(configureEncoderSlot())); - connect(kcfg_currentEncoder, TQT_SIGNAL(doubleClicked ( TQListBoxItem * )),this, TQT_SLOT(configureEncoderSlot())); + connect(addEncoder, TQ_SIGNAL(clicked()), this, TQ_SLOT(addEncoderSlot())); + connect(removeEncoder, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeEncoderSlot())); + connect(configureEncoder, TQ_SIGNAL(clicked()), this, TQ_SLOT(configureEncoderSlot())); + connect(kcfg_currentEncoder, TQ_SIGNAL(doubleClicked ( TQListBoxItem * )),this, TQ_SLOT(configureEncoderSlot())); // If there are no encoders then store the three default ones. if( Prefs::lastKnownEncoder() == 0){ @@ -138,7 +138,7 @@ void EncoderConfigImp::addEncoderSlot(){ KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help); dialog->setCaption(i18n("Configure Encoder")); dialog->addPage(new EncoderEdit(0, groupName.latin1()), i18n("Encoder Configuration"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(loadEncoderList())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(loadEncoderList())); dialog->show(); } @@ -198,9 +198,9 @@ void EncoderConfigImp::configureEncoderSlot() { KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help); dialog->setCaption(i18n("Configure Encoder")); dialog->addPage(new EncoderEdit(0, groupName.latin1()), i18n("Encoder Configuration"), "package_settings"); - connect(dialog, TQT_SIGNAL(destroyed(TQObject *)), this, TQT_SLOT(updateEncoder(TQObject *))); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SIGNAL(encoderUpdated())); - connect(dialog, TQT_SIGNAL(settingsChanged(const char *)), this, TQT_SLOT(updateEncoder(const char *))); + connect(dialog, TQ_SIGNAL(destroyed(TQObject *)), this, TQ_SLOT(updateEncoder(TQObject *))); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SIGNAL(encoderUpdated())); + connect(dialog, TQ_SIGNAL(settingsChanged(const char *)), this, TQ_SLOT(updateEncoder(const char *))); dialog->show(); } diff --git a/kaudiocreator/general.ui b/kaudiocreator/general.ui index 3e29240c..2fd465f3 100644 --- a/kaudiocreator/general.ui +++ b/kaudiocreator/general.ui @@ -278,8 +278,8 @@ <includes> <include location="local" impldecl="in implementation">general.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected" specifier="non virtual">updateExample()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaudiocreator/jobqueimp.cpp b/kaudiocreator/jobqueimp.cpp index a800aea3..1d238110 100644 --- a/kaudiocreator/jobqueimp.cpp +++ b/kaudiocreator/jobqueimp.cpp @@ -33,7 +33,7 @@ #include <tqfile.h> #include <tqregexp.h> #include <tqfileinfo.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <knotifyclient.h> #include <tqdir.h> @@ -51,9 +51,9 @@ */ JobQueImp::JobQueImp( TQWidget* parent, const char* name) : JobQue(parent,name),highestNumber(DEFAULT_HIGHEST_NUMBER), currentId(0){ - connect(removeSelected,TQT_SIGNAL(clicked()), this, TQT_SLOT( removeSelectedJob())); - connect(removeAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeAllJobs())); - connect(removeDoneJobs, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearDoneJobs())); + connect(removeSelected,TQ_SIGNAL(clicked()), this, TQ_SLOT( removeSelectedJob())); + connect(removeAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeAllJobs())); + connect(removeDoneJobs, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearDoneJobs())); } /** diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp index 8c752338..115de82f 100644 --- a/kaudiocreator/kaudiocreator.cpp +++ b/kaudiocreator/kaudiocreator.cpp @@ -58,80 +58,80 @@ KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) : TQVBox *frame = janusWidget->addVBoxPage(i18n("&CD Tracks"), TQString(), SmallIcon("media-optical-cdaudio-unmounted", 32)); tracks = new TracksImp(frame, "Tracks"); - ripper = new Ripper ( TQT_TQOBJECT(frame), "Rip" ); - encoder = new Encoder( TQT_TQOBJECT(frame), "Encoder" ); + ripper = new Ripper ( frame, "Rip" ); + encoder = new Encoder( frame, "Encoder" ); frame = janusWidget->addVBoxPage( i18n("&Jobs"), TQString(), SmallIcon( "system-run", 32 ) ); jobQue = new JobQueImp( frame, "Que" ); resize(500, 440); - /*TDEAction *eject = */new TDEAction( i18n("&Eject CD"), 0, TQT_TQOBJECT(tracks), - TQT_SLOT( eject() ), actionCollection(), "eject" ); + /*TDEAction *eject = */new TDEAction( i18n("&Eject CD"), 0, tracks, + TQ_SLOT( eject() ), actionCollection(), "eject" ); - (void)new TDEAction( i18n("&Configure KAudioCreator..."), 0, TQT_TQOBJECT(this), - TQT_SLOT( showSettings() ), actionCollection(), "configure_kaudiocreator" ); + (void)new TDEAction( i18n("&Configure KAudioCreator..."), 0, this, + TQ_SLOT( showSettings() ), actionCollection(), "configure_kaudiocreator" ); - TDEAction *selectAll = new TDEAction( i18n( "Select &All Tracks"), 0, TQT_TQOBJECT(tracks), - TQT_SLOT( selectAllTracks() ), actionCollection(), "select_all" ) ; - TDEAction *deselectAll = new TDEAction( i18n( "Deselect &All Tracks"), 0, TQT_TQOBJECT(tracks), - TQT_SLOT( deselectAllTracks() ), actionCollection(), "deselect_all" ); + TDEAction *selectAll = new TDEAction( i18n( "Select &All Tracks"), 0, tracks, + TQ_SLOT( selectAllTracks() ), actionCollection(), "select_all" ) ; + TDEAction *deselectAll = new TDEAction( i18n( "Deselect &All Tracks"), 0, tracks, + TQ_SLOT( deselectAllTracks() ), actionCollection(), "deselect_all" ); selectAll->setEnabled( false ); deselectAll->setEnabled( false ); TDEActionMenu *actActionMenu = new TDEActionMenu( i18n("Rip &Selection"), "rip", actionCollection(), "rip" ); actActionMenu->setDelayed(true); //needed for checking "all accounts" actActionMenu->setEnabled( false ); - connect( actActionMenu, TQT_SIGNAL( activated() ), TQT_TQOBJECT(tracks), TQT_SLOT( startSession() ) ); + connect( actActionMenu, TQ_SIGNAL( activated() ), tracks, TQ_SLOT( startSession() ) ); ripMenu = actActionMenu->popupMenu(); - connect( ripMenu, TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this), TQT_SLOT( slotRipSelection(int)) ); - connect( ripMenu, TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( getRipMenu()) ); + connect( ripMenu, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotRipSelection(int)) ); + connect( ripMenu, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( getRipMenu()) ); - TDEAction *rip = new TDEAction( i18n( "Rip &Selection" ), 0, TQT_TQOBJECT(tracks), - TQT_SLOT( startSession() ), actionCollection(), "rip_selected" ); + TDEAction *rip = new TDEAction( i18n( "Rip &Selection" ), 0, tracks, + TQ_SLOT( startSession() ), actionCollection(), "rip_selected" ); rip->setEnabled( false ); - connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(this), TQT_SLOT( updateStatus() ) ); - connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(ripper), TQT_SLOT( removeJob(int) ) ); - connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(encoder), TQT_SLOT( removeJob(int)) ); - - connect( ripper, TQT_SIGNAL( updateProgress(int, int) ), TQT_TQOBJECT(jobQue), TQT_SLOT( updateProgress(int,int) ) ); - connect( ripper, TQT_SIGNAL( addJob(Job*, const TQString &) ), TQT_TQOBJECT(jobQue), TQT_SLOT( addJob(Job*, const TQString &)) ); - connect( ripper, TQT_SIGNAL( eject(const TQString &) ) , TQT_TQOBJECT(tracks), TQT_SLOT( ejectDevice(const TQString &)) ); - connect( ripper, TQT_SIGNAL( encodeWav(Job *) ) , TQT_TQOBJECT(encoder), TQT_SLOT( encodeWav(Job *)) ); - connect( ripper, TQT_SIGNAL( jobsChanged() ) , TQT_TQOBJECT(this), TQT_SLOT( updateStatus() ) ); - - connect( encoder, TQT_SIGNAL( updateProgress(int, int) ) , TQT_TQOBJECT(jobQue), TQT_SLOT( updateProgress(int,int)) ); - connect( encoder, TQT_SIGNAL( addJob(Job*, const TQString&)), TQT_TQOBJECT(jobQue), TQT_SLOT( addJob(Job*, const TQString &)) ); - connect( encoder, TQT_SIGNAL( jobsChanged() ) , TQT_TQOBJECT(this), TQT_SLOT( updateStatus() ) ); - - connect( tracks, TQT_SIGNAL( hasCD(bool) ) , TQT_TQOBJECT(this), TQT_SLOT( hasCD(bool) ) ); - connect( tracks, TQT_SIGNAL( ripTrack(Job *) ), TQT_TQOBJECT(ripper), TQT_SLOT( ripTrack(Job *)) ); - connect( tracks, TQT_SIGNAL( hasTracks(bool) ), rip, TQT_SLOT( setEnabled(bool)) ); - connect( tracks, TQT_SIGNAL( hasTracks(bool) ), actActionMenu, TQT_SLOT( setEnabled(bool)) ); - connect( tracks, TQT_SIGNAL( hasTracks(bool) ), deselectAll, TQT_SLOT( setEnabled(bool)) ); - connect( tracks, TQT_SIGNAL( hasTracks(bool) ), selectAll, TQT_SLOT( setEnabled(bool)) ); - - (void)new TDEAction(i18n("Remove &Completed Jobs"), 0, TQT_TQOBJECT(jobQue), - TQT_SLOT(clearDoneJobs()), actionCollection(), "clear_done_jobs" ); - - TDEAction *edit = new TDEAction(i18n("&Edit Album..."), 0, TQT_TQOBJECT(tracks), - TQT_SLOT(editInformation()), actionCollection(), "edit_cd"); - connect(tracks, TQT_SIGNAL(hasCD(bool)), edit, TQT_SLOT(setEnabled(bool))); + connect( jobQue, TQ_SIGNAL( removeJob(int) ), this, TQ_SLOT( updateStatus() ) ); + connect( jobQue, TQ_SIGNAL( removeJob(int) ), ripper, TQ_SLOT( removeJob(int) ) ); + connect( jobQue, TQ_SIGNAL( removeJob(int) ), encoder, TQ_SLOT( removeJob(int)) ); + + connect( ripper, TQ_SIGNAL( updateProgress(int, int) ), jobQue, TQ_SLOT( updateProgress(int,int) ) ); + connect( ripper, TQ_SIGNAL( addJob(Job*, const TQString &) ), jobQue, TQ_SLOT( addJob(Job*, const TQString &)) ); + connect( ripper, TQ_SIGNAL( eject(const TQString &) ) , tracks, TQ_SLOT( ejectDevice(const TQString &)) ); + connect( ripper, TQ_SIGNAL( encodeWav(Job *) ) , encoder, TQ_SLOT( encodeWav(Job *)) ); + connect( ripper, TQ_SIGNAL( jobsChanged() ) , this, TQ_SLOT( updateStatus() ) ); + + connect( encoder, TQ_SIGNAL( updateProgress(int, int) ) , jobQue, TQ_SLOT( updateProgress(int,int)) ); + connect( encoder, TQ_SIGNAL( addJob(Job*, const TQString&)), jobQue, TQ_SLOT( addJob(Job*, const TQString &)) ); + connect( encoder, TQ_SIGNAL( jobsChanged() ) , this, TQ_SLOT( updateStatus() ) ); + + connect( tracks, TQ_SIGNAL( hasCD(bool) ) , this, TQ_SLOT( hasCD(bool) ) ); + connect( tracks, TQ_SIGNAL( ripTrack(Job *) ), ripper, TQ_SLOT( ripTrack(Job *)) ); + connect( tracks, TQ_SIGNAL( hasTracks(bool) ), rip, TQ_SLOT( setEnabled(bool)) ); + connect( tracks, TQ_SIGNAL( hasTracks(bool) ), actActionMenu, TQ_SLOT( setEnabled(bool)) ); + connect( tracks, TQ_SIGNAL( hasTracks(bool) ), deselectAll, TQ_SLOT( setEnabled(bool)) ); + connect( tracks, TQ_SIGNAL( hasTracks(bool) ), selectAll, TQ_SLOT( setEnabled(bool)) ); + + (void)new TDEAction(i18n("Remove &Completed Jobs"), 0, jobQue, + TQ_SLOT(clearDoneJobs()), actionCollection(), "clear_done_jobs" ); + + TDEAction *edit = new TDEAction(i18n("&Edit Album..."), 0, tracks, + TQ_SLOT(editInformation()), actionCollection(), "edit_cd"); + connect(tracks, TQ_SIGNAL(hasCD(bool)), edit, TQ_SLOT(setEnabled(bool))); edit->setEnabled( false ); - (void)new TDEAction(i18n("Encode &File..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(encodeFile()), actionCollection(), "encode_file"); + (void)new TDEAction(i18n("Encode &File..."), 0, this, + TQ_SLOT(encodeFile()), actionCollection(), "encode_file"); - TDEAction *cddb = new TDEAction(i18n("&CDDB Lookup"), 0, TQT_TQOBJECT(tracks), - TQT_SLOT(performCDDB()), actionCollection(), "cddb_now"); - connect(tracks, TQT_SIGNAL(hasCD(bool)), cddb, TQT_SLOT(setEnabled(bool))); + TDEAction *cddb = new TDEAction(i18n("&CDDB Lookup"), 0, tracks, + TQ_SLOT(performCDDB()), actionCollection(), "cddb_now"); + connect(tracks, TQ_SIGNAL(hasCD(bool)), cddb, TQ_SLOT(setEnabled(bool))); cddb->setEnabled( false ); - KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(configureNotifications()), + KStdAction::configureNotifications(this, TQ_SLOT(configureNotifications()), actionCollection()); - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "quit" ); + KStdAction::quit( this, TQ_SLOT(close()), actionCollection(), "quit" ); // Init statusbar statusBar()->insertItem(i18n("No Audio CD detected"), 0 ); @@ -216,7 +216,7 @@ void KAudioCreator::configureNotifications() { void KAudioCreator::encodeFile(){ EncodeFileImp *file = new EncodeFileImp(this, "EncodeFile"); - connect(file, TQT_SIGNAL(startJob(Job*)),encoder, TQT_SLOT(encodeWav(Job*))); + connect(file, TQ_SIGNAL(startJob(Job*)),encoder, TQ_SLOT(encodeWav(Job*))); file->show(); } @@ -228,10 +228,10 @@ void KAudioCreator::showSettings(){ return; SettingsDialog *dialog = new SettingsDialog(this, "settings", Prefs::self()); - connect(dialog, TQT_SIGNAL(settingsChanged()), ripper, TQT_SLOT(loadSettings())); - connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(encoder), TQT_SLOT(loadSettings())); - connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(tracks), TQT_SLOT(loadSettings())); - connect(dialog->encoderConfigImp, TQT_SIGNAL(encoderUpdated()), TQT_TQOBJECT(encoder), TQT_SLOT(loadSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), ripper, TQ_SLOT(loadSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), encoder, TQ_SLOT(loadSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), tracks, TQ_SLOT(loadSettings())); + connect(dialog->encoderConfigImp, TQ_SIGNAL(encoderUpdated()), encoder, TQ_SLOT(loadSettings())); dialog->show(); } @@ -253,7 +253,7 @@ SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,TDEConfigSkele { cddb->load(); addPage(cddb, i18n("CDDB"), "media-optical-cdaudio-mounted", i18n("CDDB Configuration"), false); - connect(cddb, TQT_SIGNAL(changed(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotCddbChanged(bool))); + connect(cddb, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(slotCddbChanged(bool))); } } RipConfig *rip = new RipConfig(0, "Ripper"); diff --git a/kaudiocreator/ripper.cpp b/kaudiocreator/ripper.cpp index 657d21b2..3a7b62de 100644 --- a/kaudiocreator/ripper.cpp +++ b/kaudiocreator/ripper.cpp @@ -26,7 +26,7 @@ #include <tdetempfile.h> #include <tdemessagebox.h> #include <knotifyclient.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeio/scheduler.h> /** @@ -57,8 +57,8 @@ Ripper::~Ripper(){ if(ioJob){ TDEIO::FileCopyJob *copyJob = static_cast<TDEIO::FileCopyJob*> (ioJob); - disconnect(copyJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(copyJobResult(TDEIO::Job*))); - disconnect(copyJob, TQT_SIGNAL(percent ( TDEIO::Job *, unsigned long)), this, TQT_SLOT(updateProgress ( TDEIO::Job *, unsigned long))); + disconnect(copyJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(copyJobResult(TDEIO::Job*))); + disconnect(copyJob, TQ_SIGNAL(percent ( TDEIO::Job *, unsigned long)), this, TQ_SLOT(updateProgress ( TDEIO::Job *, unsigned long))); TQString fileDestination = (copyJob->destURL()).path(); copyJob->kill(); TQFile file( fileDestination ); @@ -184,8 +184,8 @@ void Ripper::tendToNewJobs(){ TDEIO::FileCopyJob *copyJob = new TDEIO::FileCopyJob(source, dest, 0644, false, true, false, false); jobs.insert(copyJob, job); - connect(copyJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(copyJobResult(TDEIO::Job*))); - connect(copyJob, TQT_SIGNAL(percent ( TDEIO::Job *, unsigned long)), this, TQT_SLOT(updateProgress ( TDEIO::Job *, unsigned long))); + connect(copyJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(copyJobResult(TDEIO::Job*))); + connect(copyJob, TQ_SIGNAL(percent ( TDEIO::Job *, unsigned long)), this, TQ_SLOT(updateProgress ( TDEIO::Job *, unsigned long))); emit jobsChanged(); } @@ -234,7 +234,7 @@ void Ripper::copyJobResult(TDEIO::Job *copyjob){ } if( !job ){ deviceToEject = newJob->device; - TQTimer::singleShot( Prefs::autoEjectDelay()*1000 + 500, this, TQT_SLOT(ejectNow())); + TQTimer::singleShot( Prefs::autoEjectDelay()*1000 + 500, this, TQ_SLOT(ejectNow())); } } KNotifyClient::event("cd ripped"); diff --git a/kaudiocreator/tracksimp.cpp b/kaudiocreator/tracksimp.cpp index 0d7ab5cd..89725f00 100644 --- a/kaudiocreator/tracksimp.cpp +++ b/kaudiocreator/tracksimp.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kinputdialog.h> #include <tdelistview.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdemessagebox.h> #include <kurl.h> @@ -55,22 +55,22 @@ TracksImp::TracksImp( TQWidget* parent, const char* name) : { cd = new TDECompactDisc; - connect(cd,TQT_SIGNAL(discChanged(unsigned)),this,TQT_SLOT(newDisc(unsigned))); + connect(cd,TQ_SIGNAL(discChanged(unsigned)),this,TQ_SLOT(newDisc(unsigned))); - connect(trackListing, TQT_SIGNAL(clicked( TQListViewItem * )), this, TQT_SLOT(selectTrack(TQListViewItem*))); - connect(trackListing, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(editInformation())); - connect(trackListing, TQT_SIGNAL(returnPressed(TQListViewItem *)), this, TQT_SLOT(editInformation())); - connect(selectAllTracksButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectAllTracks())); - connect(deselectAllTracksButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deselectAllTracks())); + connect(trackListing, TQ_SIGNAL(clicked( TQListViewItem * )), this, TQ_SLOT(selectTrack(TQListViewItem*))); + connect(trackListing, TQ_SIGNAL(doubleClicked(TQListViewItem *)), this, TQ_SLOT(editInformation())); + connect(trackListing, TQ_SIGNAL(returnPressed(TQListViewItem *)), this, TQ_SLOT(editInformation())); + connect(selectAllTracksButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectAllTracks())); + connect(deselectAllTracksButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deselectAllTracks())); - connect(deviceCombo, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changeDevice(const TQString &))); + connect(deviceCombo, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changeDevice(const TQString &))); selectAllTracksButton->setEnabled( false ); deselectAllTracksButton->setEnabled( false ); cddb = new KCDDB::Client(); cddb->setBlockingMode(false); - connect(cddb, TQT_SIGNAL(finished(CDDB::Result)), this, TQT_SLOT(lookupCDDBDone(CDDB::Result))); + connect(cddb, TQ_SIGNAL(finished(CDDB::Result)), this, TQ_SLOT(lookupCDDBDone(CDDB::Result))); trackListing->setSorting(-1, false); loadSettings(); } diff --git a/kaudiocreator/wizard.ui b/kaudiocreator/wizard.ui index 970a5e84..0bda9d41 100644 --- a/kaudiocreator/wizard.ui +++ b/kaudiocreator/wizard.ui @@ -392,7 +392,7 @@ <includes> <include location="local" impldecl="in implementation">wizard.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="private">homePressed()</slot> <slot>extensionPressed()</slot> <slot access="private">trackTitlePressed()</slot> @@ -405,6 +405,6 @@ <slot>artistPressed()</slot> <slot>commentPressed()</slot> <slot>fileFormatTextChanged( const TQString & text )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmix/KMixApp.cpp b/kmix/KMixApp.cpp index 40bf6cfb..407fc1aa 100644 --- a/kmix/KMixApp.cpp +++ b/kmix/KMixApp.cpp @@ -26,7 +26,7 @@ KMixApp::KMixApp() - : KUniqueApplication(), m_kmix( 0 ) + : TDEUniqueApplication(), m_kmix( 0 ) { // We handle autostart via standard autostart-enabled .desktop file instead of the session manager disableSessionManagement(); @@ -49,10 +49,10 @@ KMixApp::newInstance() else { m_kmix = new KMixWindow; - connect(this, TQT_SIGNAL(stopUpdatesOnVisibility()), m_kmix, TQT_SLOT(stopVisibilityUpdates())); + connect(this, TQ_SIGNAL(stopUpdatesOnVisibility()), m_kmix, TQ_SLOT(stopVisibilityUpdates())); if ( isRestored() && TDEMainWindow::canBeRestored(0) ) { - m_kmix->restore(0, FALSE); + m_kmix->restore(0, false); } } diff --git a/kmix/KMixApp.h b/kmix/KMixApp.h index b3698f56..a34c3978 100644 --- a/kmix/KMixApp.h +++ b/kmix/KMixApp.h @@ -1,11 +1,11 @@ #ifndef KMixApp_h #define KMixApp_h -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> class KMixWindow; -class KMixApp : public KUniqueApplication +class KMixApp : public TDEUniqueApplication { TQ_OBJECT diff --git a/kmix/appearanceconfig.ui b/kmix/appearanceconfig.ui index a55f5a11..294b00fb 100644 --- a/kmix/appearanceconfig.ui +++ b/kmix/appearanceconfig.ui @@ -8,8 +8,8 @@ <rect> <x>0</x> <y>0</y> - <width>464</width> - <height>280</height> + <width>487</width> + <height>278</height> </rect> </property> <property name="caption"> @@ -19,30 +19,18 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="TQComboBox" row="0" column="1"> - <item> - <property name="text"> - <string>Horizontal</string> - </property> - </item> - <item> - <property name="text"> - <string>Vertical</string> - </property> - </item> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>kcfg_Orientation</cstring> + <cstring>kcfg_Menubar</cstring> </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>3</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <property name="text"> + <string>Show &menu bar</string> + </property> + <property name="checked"> + <bool>true</bool> </property> </widget> - <widget class="TQLabel" row="1" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblValueStyle</cstring> </property> @@ -50,20 +38,12 @@ <string>Volume values:</string> </property> </widget> - <widget class="TQLabel" row="0" column="0"> + <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>lblOrientation</cstring> - </property> - <property name="text"> - <string>Sliders orientation:</string> - </property> - </widget> - <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>kcfg_Tickmarks</cstring> + <cstring>kcfg_Labels</cstring> </property> <property name="text"> - <string>Show &tickmarks</string> + <string>Show &labels</string> </property> <property name="checked"> <bool>true</bool> @@ -71,27 +51,44 @@ </widget> <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>kcfg_Labels</cstring> + <cstring>kcfg_Tickmarks</cstring> </property> <property name="text"> - <string>Show &labels</string> + <string>Show &tickmarks</string> </property> <property name="checked"> <bool>true</bool> </property> </widget> - <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQComboBox" row="2" column="1"> + <item> + <property name="text"> + <string>None</string> + </property> + </item> + <item> + <property name="text"> + <string>Absolute</string> + </property> + </item> + <item> + <property name="text"> + <string>Relative</string> + </property> + </item> <property name="name"> - <cstring>kcfg_Menubar</cstring> - </property> - <property name="text"> - <string>Show &menu bar</string> + <cstring>kcfg_ValueStyle</cstring> </property> - <property name="checked"> - <bool>true</bool> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>3</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> </widget> - <spacer row="5" column="1"> + <spacer row="6" column="1"> <property name="name"> <cstring>spacer5</cstring> </property> @@ -108,24 +105,63 @@ </size> </property> </spacer> + <widget class="TQLabel" row="1" column="0"> + <property name="name"> + <cstring>lblOrientation</cstring> + </property> + <property name="text"> + <string>Sliders orientation:</string> + </property> + </widget> <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> - <string>None</string> + <string>Horizontal</string> </property> </item> <item> <property name="text"> - <string>Absolute</string> + <string>Vertical</string> </property> </item> + <property name="name"> + <cstring>kcfg_Orientation</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>3</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + <widget class="TQLabel" row="0" column="0"> + <property name="name"> + <cstring>lblOrientation_2</cstring> + </property> + <property name="text"> + <string>Icon theme:</string> + </property> + </widget> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> - <string>Relative</string> + <string>Crystal</string> + </property> + </item> + <item> + <property name="text"> + <string>Classic (Old Crystal)</string> + </property> + </item> + <item> + <property name="text"> + <string>System</string> </property> </item> <property name="name"> - <cstring>kcfg_ValueStyle</cstring> + <cstring>kcfg_IconTheme</cstring> </property> <property name="sizePolicy"> <sizepolicy> diff --git a/kmix/dialogselectmaster.cpp b/kmix/dialogselectmaster.cpp index b2020397..1d1f2d61 100644 --- a/kmix/dialogselectmaster.cpp +++ b/kmix/dialogselectmaster.cpp @@ -62,7 +62,7 @@ void DialogSelectMaster::createWidgets(Mixer *ptr_mixer) // Default or user selected TQButtonGroup *bgMasterSelection = new TQButtonGroup(1, TQt::Vertical, i18n("KMix master channel selection"), m_mainFrame); - connect(bgMasterSelection, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(masterSelectionChanged(int))); + connect(bgMasterSelection, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(masterSelectionChanged(int))); _layout->add(bgMasterSelection); m_defaultMaster = new TQRadioButton(i18n("Default"), bgMasterSelection); m_userMaster = new TQRadioButton(i18n("Custom"), bgMasterSelection); @@ -79,10 +79,10 @@ void DialogSelectMaster::createWidgets(Mixer *ptr_mixer) TQLabel *qlbl = new TQLabel( i18n("Current Mixer"), hboxMixerName ); qlbl->setFixedHeight(qlbl->sizeHint().height()); - m_cMixer = new KComboBox( FALSE, hboxMixerName, "mixerCombo" ); + m_cMixer = new KComboBox( false, hboxMixerName, "mixerCombo" ); m_cMixer->setFixedHeight(m_cMixer->sizeHint().height()); TQToolTip::add(m_cMixer, i18n("Current mixer")); - connect(m_cMixer, TQT_SIGNAL(activated(int)), this, TQT_SLOT(createPageByID(int))); + connect(m_cMixer, TQ_SIGNAL(activated(int)), this, TQ_SLOT(createPageByID(int))); for ( Mixer *mixer = Mixer::mixers().first(); mixer !=0; mixer = Mixer::mixers().next() ) { m_cMixer->insertItem(mixer->mixerName()); @@ -97,13 +97,13 @@ void DialogSelectMaster::createWidgets(Mixer *ptr_mixer) m_buttonGroupForScrollView = new TQButtonGroup(this); // invisible TQButtonGroup m_buttonGroupForScrollView->hide(); - connect( this, TQT_SIGNAL(okClicked()) , this, TQT_SLOT(apply()) ); + connect( this, TQ_SIGNAL(okClicked()) , this, TQ_SLOT(apply()) ); } void DialogSelectMaster::show(Mixer *curr_mixer) { - kapp->config()->setGroup(0); - bool useDefaultMaster = kapp->config()->readBoolEntry("UseDefaultMaster", true); + tdeApp->config()->setGroup(0); + bool useDefaultMaster = tdeApp->config()->readBoolEntry("UseDefaultMaster", true); if (useDefaultMaster) { m_defaultMaster->setChecked(true); diff --git a/kmix/dialogviewconfiguration.cpp b/kmix/dialogviewconfiguration.cpp index d6deb523..81a411fe 100644 --- a/kmix/dialogviewconfiguration.cpp +++ b/kmix/dialogviewconfiguration.cpp @@ -59,7 +59,7 @@ DialogViewConfiguration::DialogViewConfiguration( TQWidget*, ViewBase& view) } _layout->activate(); resize(_layout->sizeHint() ); - connect( this, TQT_SIGNAL(okClicked()) , this, TQT_SLOT(apply()) ); + connect( this, TQ_SIGNAL(okClicked()) , this, TQ_SLOT(apply()) ); } DialogViewConfiguration::~DialogViewConfiguration() diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp index 20e9c58f..3ce9940d 100644 --- a/kmix/kmix.cpp +++ b/kmix/kmix.cpp @@ -49,7 +49,7 @@ #include <khelpmenu.h> #include <kdebug.h> #include <tdeaccel.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <kkeydialog.h> #include <tdeconfigdialog.h> @@ -97,7 +97,7 @@ KMixWindow::KMixWindow() { hide(); } - connect( kapp, TQT_SIGNAL( aboutToQuit()), TQT_SLOT( saveSettings()) ); + connect( tdeApp, TQ_SIGNAL( aboutToQuit()), TQ_SLOT( saveSettings()) ); } @@ -111,25 +111,25 @@ void KMixWindow::initActions() { // file menu - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection()); + KStdAction::quit( this, TQ_SLOT(quit()), actionCollection()); // settings menu - KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBar()), actionCollection()); - KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection()); - new TDEAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, TQT_TQOBJECT(this), - TQT_SLOT( configureGlobalShortcuts() ), actionCollection(), "settings_global" ); - KStdAction::keyBindings( guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); + KStdAction::showMenubar( this, TQ_SLOT(toggleMenuBar()), actionCollection()); + KStdAction::preferences( this, TQ_SLOT(showSettings()), actionCollection()); + new TDEAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, this, + TQ_SLOT( configureGlobalShortcuts() ), actionCollection(), "settings_global" ); + KStdAction::keyBindings( guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); - (void) new TDEAction( i18n( "Hardware &Information" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotHWInfo() ), actionCollection(), "hwinfo" ); - (void) new TDEAction( i18n( "Hide Mixer Window" ), Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(hide()), actionCollection(), "hide_kmixwindow" ); + (void) new TDEAction( i18n( "Hardware &Information" ), 0, this, TQ_SLOT( slotHWInfo() ), actionCollection(), "hwinfo" ); + (void) new TDEAction( i18n( "Hide Mixer Window" ), Key_Escape, this, TQ_SLOT(hide()), actionCollection(), "hide_kmixwindow" ); m_globalAccel = new TDEGlobalAccel(this, "KMix"); m_globalAccel->insert( "Increase volume", i18n( "Increase Volume of Master Channel"), TQString(), - TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotIncreaseVolume() ) ); + TDEShortcut(), TDEShortcut(), this, TQ_SLOT( slotIncreaseVolume() ) ); m_globalAccel->insert( "Decrease volume", i18n( "Decrease Volume of Master Channel"), TQString(), - TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDecreaseVolume() ) ); + TDEShortcut(), TDEShortcut(), this, TQ_SLOT( slotDecreaseVolume() ) ); m_globalAccel->insert( "Toggle mute", i18n( "Toggle Mute of Master Channel"), TQString(), - TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotToggleMuted() ) ); + TDEShortcut(), TDEShortcut(), this, TQ_SLOT( slotToggleMuted() ) ); m_globalAccel->readSettings(); m_globalAccel->updateConnections(); @@ -155,9 +155,9 @@ KMixWindow::initWidgets() mixerNameLayout->setSpacing(KDialog::spacingHint()); TQLabel *qlbl = new TQLabel( i18n("Current mixer:"), mixerNameLayout ); qlbl->setFixedHeight(qlbl->sizeHint().height()); - m_cMixer = new KComboBox( FALSE, mixerNameLayout, "mixerCombo" ); + m_cMixer = new KComboBox( false, mixerNameLayout, "mixerCombo" ); m_cMixer->setFixedHeight(m_cMixer->sizeHint().height()); - connect( m_cMixer, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( showSelectedMixer( int ) ) ); + connect( m_cMixer, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( showSelectedMixer( int ) ) ); TQToolTip::add( m_cMixer, i18n("Current mixer" ) ); // Add first layout to widgets @@ -255,7 +255,7 @@ KMixWindow::loadConfig() if (a) a->setChecked( KMixSettings::menubar() ); // restore window size and position - if ( !kapp->isRestored() ) // done by the session manager otherwise + if ( !tdeApp->isRestored() ) // done by the session manager otherwise { TQSize size = KMixSettings::size(); if(!size.isEmpty()) @@ -333,7 +333,7 @@ KMixWindow::initMixerWidgets() bool KMixWindow::queryClose ( ) { - if ( KMixSettings::allowDocking() && !kapp->sessionSaving() ) + if ( KMixSettings::allowDocking() && !tdeApp->sessionSaving() ) { hide(); return false; @@ -345,7 +345,7 @@ KMixWindow::queryClose ( ) void KMixWindow::quit() { - kapp->quit(); + tdeApp->quit(); } @@ -370,7 +370,7 @@ KMixWindow::showSettings() cfg->addPage(cfgx, i18n("Experimental"), "bug"); #endif - connect(cfg, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(applyPrefs())); + connect(cfg, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(applyPrefs())); cfg->show(); } @@ -449,7 +449,7 @@ KMixWindow::applyPrefs() this->setUpdatesEnabled(true); this->repaint(); // make KMix look fast (saveConfig() often uses several seconds) - kapp->processEvents(); + tdeApp->processEvents(); saveConfig(); } diff --git a/kmix/kmix.kcfg b/kmix/kmix.kcfg index b6d595bd..d4ca0956 100644 --- a/kmix/kmix.kcfg +++ b/kmix/kmix.kcfg @@ -99,4 +99,21 @@ <default></default> </entry> </group> + <group name="Appearance"> + <entry key="IconTheme" type="Enum"> + <choices> + <choice name="Crystal"> + <label>Crystal</label> + </choice> + <choice name="OldCrystal"> + <label>Classic (Old Crystal)</label> + </choice> + <choice name="System"> + <label>System theme</label> + </choice> + </choices> + <default>Crystal</default> + <label>Icon Theme</label> + </entry> + </group> </kcfg>
\ No newline at end of file diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp index a4770993..b65458c8 100644 --- a/kmix/kmixapplet.cpp +++ b/kmix/kmixapplet.cpp @@ -44,13 +44,13 @@ #include <tdeconfig.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <tdeglobalsettings.h> #include <kiconloader.h> #include <kinputdialog.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // // KMix #include "colorwidget.h" @@ -66,7 +66,7 @@ extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("kmix"); return new KMixApplet(configFile, KPanelApplet::Normal, @@ -165,7 +165,7 @@ KMixApplet::KMixApplet( const TQString& configFile, Type t, // init static vars if ( s_instCount == 0) { - Mixer::mixers().setAutoDelete( TRUE ); + Mixer::mixers().setAutoDelete( true ); TQString dummyStringHwinfo; MixerToolBox::initMixer(Mixer::mixers(), false, dummyStringHwinfo); } @@ -208,7 +208,7 @@ KMixApplet::KMixApplet( const TQString& configFile, Type t, m_errorLabel->setGeometry(0, 0, m_errorLabel->sizeHint().width(), m_errorLabel->sizeHint().height() ); TQToolTip::add(m_errorLabel, "Select one of the available mixers"); resize( m_errorLabel->sizeHint() ); - connect( m_errorLabel, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectMixer()) ); + connect( m_errorLabel, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectMixer()) ); } else { // We know which mixer to use: Call positionChange(), which does all the creating @@ -288,7 +288,7 @@ void KMixApplet::loadConfig( TDEConfig *config, const TQString &grp ) if ( m_mixerWidget ) { //config->setGroup( grp ); KMixToolBox::loadConfig(m_mixerWidget->_mdws, config, grp, "PanelApplet" ); - connect(m_mixerWidget, TQT_SIGNAL(selectMixer()), this, TQT_SLOT(selectMixer())); + connect(m_mixerWidget, TQ_SIGNAL(selectMixer()), this, TQ_SLOT(selectMixer())); } } @@ -321,10 +321,10 @@ void KMixApplet::selectMixer() n++; } - bool ok = FALSE; + bool ok = false; TQString res = KInputDialog::getItem( i18n("Mixers"), i18n("Available mixers:"), - lst, 0, FALSE, &ok, this ); + lst, 0, false, &ok, this ); if ( ok ) { Mixer *mixer = Mixer::mixers().at( lst.findIndex( res ) ); @@ -369,7 +369,7 @@ void KMixApplet::positionChange(Position pos) { delete m_mixerWidget; } m_mixerWidget = new ViewApplet( this, _mixer->name(), _mixer, 0, pos ); - connect ( m_mixerWidget, TQT_SIGNAL(appletContentChanged()), this, TQT_SLOT(updateGeometrySlot()) ); + connect ( m_mixerWidget, TQ_SIGNAL(appletContentChanged()), this, TQ_SLOT(updateGeometrySlot()) ); m_mixerWidget->createDeviceWidgets(); _layout->add(m_mixerWidget); _layout->activate(); @@ -383,7 +383,7 @@ void KMixApplet::positionChange(Position pos) { //setFixedSize(panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() ); //kdDebug(67100) << "KMixApplet::positionChange(). New MDW is at " << panelAppletConstrainedSize << endl; m_mixerWidget->show(); - //connect( _mixer, TQT_SIGNAL(newVolumeLevels()), m_mixerWidget, TQT_SLOT(refreshVolumeLevels()) ); + //connect( _mixer, TQ_SIGNAL(newVolumeLevels()), m_mixerWidget, TQ_SLOT(refreshVolumeLevels()) ); } } @@ -479,8 +479,8 @@ void KMixApplet::preferences() if ( !m_pref ) { m_pref = new AppletConfigDialog( this ); - connect(m_pref, TQT_SIGNAL(finished()), TQT_SLOT(preferencesDone())); - connect( m_pref, TQT_SIGNAL(applied()), TQT_SLOT(applyPreferences()) ); + connect(m_pref, TQ_SIGNAL(finished()), TQ_SLOT(preferencesDone())); + connect( m_pref, TQ_SIGNAL(applied()), TQ_SLOT(applyPreferences()) ); m_pref->setActiveColors(_colors.high , _colors.low , _colors.back); m_pref->setMutedColors (_colors.mutedHigh, _colors.mutedLow, _colors.mutedBack); diff --git a/kmix/kmixctrl.cpp b/kmix/kmixctrl.cpp index 9f6188c7..40472212 100644 --- a/kmix/kmixctrl.cpp +++ b/kmix/kmixctrl.cpp @@ -24,7 +24,7 @@ #include <tdeaboutdata.h> #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <kdebug.h> #include <tqptrlist.h> @@ -46,7 +46,7 @@ static TDECmdLineOptions options[] = // INSERT YOUR COMMANDLINE OPTIONS HERE }; -extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) +extern "C" TDE_EXPORT int kdemain(int argc, char *argv[]) { TDELocale::setMainCatalogue("kmix"); TDEAboutData aboutData( "kmixctrl", I18N_NOOP("KMixCtrl"), diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp index 8867b40b..6baf4666 100644 --- a/kmix/kmixdockwidget.cpp +++ b/kmix/kmixdockwidget.cpp @@ -34,6 +34,7 @@ #include <tdelocale.h> #include <tdepopupmenu.h> #include <tdeglobalsettings.h> +#include <tdestandarddirs.h> #include <tdemainwindow.h> #include <tqapplication.h> @@ -47,6 +48,7 @@ #include "mixer.h" #include "mixdevicewidget.h" #include "kmixdockwidget.h" +#include "kmixsettings.h" #include "viewdockareapopup.h" KMixDockWidget::KMixDockWidget( Mixer *mixer, TQWidget *parent, const char *name, bool volumePopup, bool dockIconMuting ) @@ -71,7 +73,10 @@ KMixDockWidget::KMixDockWidget( Mixer *mixer, TQWidget *parent, const char *name } createActions(); createMasterVolWidget(); - connect(this, TQT_SIGNAL(quitSelected()), kapp, TQT_SLOT(quitExtended())); + connect(this, TQ_SIGNAL(quitSelected()), tdeApp, TQ_SLOT(quitExtended())); + + TDEGlobal::dirs()->addResourceDir("icons_crystal", locate("appdata", "pics/crystal/")); + TDEGlobal::dirs()->addResourceDir("icons_oldcrystal", locate("appdata", "pics/oldcrystal/")); } KMixDockWidget::~KMixDockWidget() @@ -89,7 +94,7 @@ void KMixDockWidget::createActions() TDEPopupMenu *popupMenu = contextMenu(); // Put "Mute" selector in context menu - (void)new TDEToggleAction(i18n("M&ute"), 0, TQT_TQOBJECT(this), TQT_SLOT(dockMute()), + (void)new TDEToggleAction(i18n("M&ute"), 0, this, TQ_SLOT(dockMute()), actionCollection(), "dock_mute"); TDEAction *a = actionCollection()->action("dock_mute"); if (a) @@ -100,7 +105,7 @@ void KMixDockWidget::createActions() // Put "Select Master Channel" dialog in context menu if (m_mixer) { - (void)new TDEAction(i18n("Select Master Channel..."), 0, TQT_TQOBJECT(this), TQT_SLOT(selectMaster()), + (void)new TDEAction(i18n("Select Master Channel..."), 0, this, TQ_SLOT(selectMaster()), actionCollection(), "select_master"); a = actionCollection()->action("select_master"); if (a) @@ -178,8 +183,8 @@ void KMixDockWidget::createMasterVolWidget() * Refreshing the Icon * */ - connect(m_mixer, TQT_SIGNAL(newVolumeLevels()), TQT_TQOBJECT(this), TQT_SLOT(setVolumeTip())); - connect(m_mixer, TQT_SIGNAL(newVolumeLevels()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdatePixmap())); + connect(m_mixer, TQ_SIGNAL(newVolumeLevels()), this, TQ_SLOT(setVolumeTip())); + connect(m_mixer, TQ_SIGNAL(newVolumeLevels()), this, TQ_SLOT(slotUpdatePixmap())); } void KMixDockWidget::deleteMasterVolWidget() @@ -191,8 +196,8 @@ void KMixDockWidget::deleteMasterVolWidget() } if (m_mixer) { - disconnect(m_mixer, TQT_SIGNAL(newVolumeLevels()), TQT_TQOBJECT(this), TQT_SLOT(setVolumeTip())); - disconnect(m_mixer, TQT_SIGNAL(newVolumeLevels()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdatePixmap())); + disconnect(m_mixer, TQ_SIGNAL(newVolumeLevels()), this, TQ_SLOT(setVolumeTip())); + disconnect(m_mixer, TQ_SIGNAL(newVolumeLevels()), this, TQ_SLOT(slotUpdatePixmap())); } } @@ -206,7 +211,7 @@ void KMixDockWidget::selectMaster() if (!_dsm) { _dsm = new DialogSelectMaster(m_mixer); - connect(_dsm, TQT_SIGNAL(newMasterSelected(bool, int, const TQString&)), TQT_SLOT( handleNewMaster(bool, int, const TQString&))); + connect(_dsm, TQ_SIGNAL(newMasterSelected(bool, int, const TQString&)), TQ_SLOT( handleNewMaster(bool, int, const TQString&))); } _dsm->show(m_mixer); } @@ -215,8 +220,8 @@ void KMixDockWidget::selectMaster() void KMixDockWidget::handleNewMaster(bool defaultMaster, int soundcard_id, const TQString &channel_id) { //kdDebug(67100) << "KMixDockWidget::handleNewMaster() default master=" << defaultMaster << ", soundcard_id=" << soundcard_id << ", channel_id=" << channel_id << endl; - kapp->config()->setGroup(0); - kapp->config()->writeEntry("UseDefaultMaster", defaultMaster); + tdeApp->config()->setGroup(0); + tdeApp->config()->writeEntry("UseDefaultMaster", defaultMaster); Mixer *mixer; TQString channel = TQString::null; if (defaultMaster) @@ -254,6 +259,20 @@ void KMixDockWidget::handleNewMaster(bool defaultMaster, int soundcard_id, const } +long +KMixDockWidget::getAvgVolume() +{ + MixDevice *md = 0; + if ( _dockAreaPopup != 0 ) { + md = _dockAreaPopup->dockDevice(); + } + + if ( md == 0 || md->maxVolume() == 0 ) + return -1; + + return (md->getVolume().getAvgVolume(Volume::MMAIN)*100 )/( md->maxVolume() ); +} + void KMixDockWidget::setVolumeTip() { @@ -261,6 +280,7 @@ KMixDockWidget::setVolumeTip() if ( _dockAreaPopup != 0 ) { md = _dockAreaPopup->dockDevice(); } + TQString tip = ""; int newToolTipValue = 0; @@ -271,10 +291,7 @@ KMixDockWidget::setVolumeTip() } else { - long val = -1; - if ( md->maxVolume() != 0 ) { - val = (md->getVolume().getAvgVolume(Volume::MMAIN)*100 )/( md->maxVolume() ); - } + long val = getAvgVolume(); newToolTipValue = val + 10000*md->isMuted(); if ( _oldToolTipValue != newToolTipValue ) { tip = i18n( "Volume at %1%" ).arg( val ); @@ -316,7 +333,13 @@ KMixDockWidget::updatePixmap(bool force) } else { - newPixmapType = 'd'; + long avgVol = getAvgVolume(); + if ( avgVol <= 33 ) + newPixmapType = 'L'; + else if ( avgVol <= 67 ) + newPixmapType = 'M'; + else + newPixmapType = 'H'; } if (( newPixmapType != _oldPixmapType ) || (force == true)) { @@ -325,12 +348,23 @@ KMixDockWidget::updatePixmap(bool force) TQPixmap origpixmap; TQPixmap scaledpixmap; TQImage newIcon; + + TQStringList fallback; switch ( newPixmapType ) { - case 'e': origpixmap = isShown() ? loadSizedIcon( "kmixdocked_error", width() ) : loadIcon( "kmixdocked_error"); break; - case 'm': origpixmap = isShown() ? loadSizedIcon( "kmixdocked_mute" , width() ) : loadIcon( "kmixdocked_mute"); break; - case 'd': origpixmap = isShown() ? loadSizedIcon( "kmixdocked" , width() ) : loadIcon( "kmixdocked "); break; + case 'm': fallback << "audio-volume-muted" << "kmixdocked_mute"; break; + case 'L': fallback << "audio-volume-low" << "kmixdocked"; break; + case 'M': fallback << "audio-volume-medium" << "kmixdocked"; break; + case 'H': fallback << "audio-volume-high" << "kmixdocked"; break; } - newIcon = origpixmap; + + TQString icon = getIconPath(fallback); + if (icon.isNull()) + { + icon = getIconPath("audio-volume-error"); + } + + origpixmap = isShown() ? loadSizedIcon(icon, width()) : loadIcon(icon); + newIcon = origpixmap; if (isShown()) { newIcon = newIcon.smoothScale(width(), height()); } @@ -341,6 +375,51 @@ KMixDockWidget::updatePixmap(bool force) } } +TQString KMixDockWidget::getIconPath(TQStringList fallback) +{ + auto iconTheme = KMixSettings::iconTheme(); + + TQCString iconThemeName; + if (iconTheme != KMixSettings::EnumIconTheme::System) + { + switch (iconTheme) + { + case KMixSettings::EnumIconTheme::OldCrystal: + iconThemeName = "oldcrystal"; + break; + + default: + case KMixSettings::EnumIconTheme::Crystal: + iconThemeName = "crystal"; + break; + } + } + + for (TQStringList::iterator it = fallback.begin(); it != fallback.end(); ++it) + { + if (iconTheme == KMixSettings::EnumIconTheme::System) + { + TQString iconPath = tdeApp->iconLoader()->iconPath((*it), TDEIcon::Panel, true); + if (!iconPath.isNull()) + { + return iconPath; + } + } + + else + { + TQCString type = "icons_" + iconThemeName; + + TQString iconPath = TDEGlobal::dirs()->findResource(type, TQString("%1.png").arg(*it)); + if (!iconPath.isNull()) return iconPath; + + iconPath = TDEGlobal::dirs()->findResource(type, TQString("%1.svg").arg(*it)); + if (!iconPath.isNull()) return iconPath; + } + } + return TQString::null; +} + void KMixDockWidget::resizeEvent ( TQResizeEvent * ) { updatePixmap(true); diff --git a/kmix/kmixdockwidget.h b/kmix/kmixdockwidget.h index a7b420a0..8f119ace 100644 --- a/kmix/kmixdockwidget.h +++ b/kmix/kmixdockwidget.h @@ -70,6 +70,8 @@ class KMixDockWidget : public KSystemTray { void toggleMinimizeRestore(); void resizeEvent(TQResizeEvent *); void showEvent(TQShowEvent *); + long getAvgVolume(); + TQString getIconPath(TQStringList fallback); private: bool _playBeepOnVolumeChange; diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp index e1d6a307..cc12c7dd 100644 --- a/kmix/kmixerwidget.cpp +++ b/kmix/kmixerwidget.cpp @@ -151,7 +151,7 @@ void KMixerWidget::createLayout(ViewBase::ViewFlags vflags) balanceAndDetail->addWidget( mixerName ); balanceAndDetail->addSpacing( 10 ); - connect( m_balanceSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(balanceChanged(int)) ); + connect( m_balanceSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(balanceChanged(int)) ); TQToolTip::add( m_balanceSlider, i18n("Left/Right balancing") ); // --- "MenuBar" toggling from the various View's --- @@ -170,7 +170,7 @@ void KMixerWidget::possiblyAddView(ViewBase* vbase) _views.push_back(vbase); vbase ->createDeviceWidgets(); m_ioTab->addTab( vbase , vbase->caption() ); - connect( vbase, TQT_SIGNAL(toggleMenuBar()), parentWidget(), TQT_SLOT(toggleMenuBar()) ); + connect( vbase, TQ_SIGNAL(toggleMenuBar()), parentWidget(), TQ_SLOT(toggleMenuBar()) ); } } diff --git a/kmix/kmixsettings.kcfgc b/kmix/kmixsettings.kcfgc index 07597da8..0ef6cff2 100644 --- a/kmix/kmixsettings.kcfgc +++ b/kmix/kmixsettings.kcfgc @@ -2,5 +2,5 @@ File=kmix.kcfg Singleton=true ClassName=KMixSettings Mutators=true -Visibility=KDE_EXPORT +Visibility=TDE_EXPORT SetUserTexts=true
\ No newline at end of file diff --git a/kmix/kmixtoolbox.cpp b/kmix/kmixtoolbox.cpp index 7e0d57c4..9376a69d 100644 --- a/kmix/kmixtoolbox.cpp +++ b/kmix/kmixtoolbox.cpp @@ -25,7 +25,7 @@ #include "tqstring.h" //#include <kdebug.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <tdelocale.h> #include "mdwslider.h" diff --git a/kmix/ksmallslider.cpp b/kmix/ksmallslider.cpp index 77ab0112..533b4646 100644 --- a/kmix/ksmallslider.cpp +++ b/kmix/ksmallslider.cpp @@ -65,7 +65,7 @@ void KSmallSlider::init() // no signals or to do no initial paint. // sliderPos = -1; // state = Idle; - //track = TRUE; + //track = true; //setMouseTracking(true); grayed = false; setFocusPolicy( TQWidget::TabFocus ); @@ -225,7 +225,7 @@ void KSmallSlider::paintEvent( TQPaintEvent * ) int sliderPos = positionFromValue( TQRangeControl::value() ); // ------------------------ draw 3d border --------------------------------------------- - style().drawPrimitive ( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TRUE ); + style().drawPrimitive ( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), colorGroup(), true ); // ------------------------ draw lower/left part ---------------------------------------- diff --git a/kmix/main.cpp b/kmix/main.cpp index 1860cf43..9a8ba9f4 100644 --- a/kmix/main.cpp +++ b/kmix/main.cpp @@ -23,7 +23,7 @@ #include <tdeaboutdata.h> #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "KMixApp.h" #include "version.h" @@ -37,11 +37,11 @@ static TDECmdLineOptions options[] = // INSERT YOUR COMMANDLINE OPTIONS HERE }; -extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) +extern "C" TDE_EXPORT int kdemain(int argc, char *argv[]) { TDEAboutData aboutData( "kmix", I18N_NOOP("KMix"), APP_VERSION, description, TDEAboutData::License_GPL, - I18N_NOOP("(c) 1996-2000 Christian Esken\n(c) 2000-2003 Christian Esken, Stefan Schimanski\n(c) 2002-2005 Christian Esken, Helio Chissini de Castro\n (c) 2010-2022 The Trinity Desktop project")); + I18N_NOOP("(c) 1996-2000 Christian Esken\n(c) 2000-2003 Christian Esken, Stefan Schimanski\n(c) 2002-2005 Christian Esken, Helio Chissini de Castro\n(c) 2010-2022 The Trinity Desktop project")); aboutData.addAuthor("Christian Esken", "Previous maintainer", "esken@kde.org"); aboutData.addAuthor("Helio Chissini de Castro", I18N_NOOP("Redesign and previous co-maintainer, Alsa 0.9x port"), "helio@kde.org" ); diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp index ceeac1f3..8449818c 100644 --- a/kmix/mdwenum.cpp +++ b/kmix/mdwenum.cpp @@ -31,7 +31,7 @@ #include <tdeaction.h> #include <tdepopupmenu.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <kkeydialog.h> #include <kdebug.h> @@ -53,15 +53,15 @@ MDWEnum::MDWEnum(Mixer *mixer, MixDevice* md, // create actions (on _mdwActions, see MixDeviceWidget) // KStdAction::showMenubar() is in MixDeviceWidget now - new TDEToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" ); - new TDEAction( i18n("C&onfigure Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" ); + new TDEToggleAction( i18n("&Hide"), 0, this, TQ_SLOT(setDisabled()), _mdwActions, "hide" ); + new TDEAction( i18n("C&onfigure Shortcuts..."), 0, this, TQ_SLOT(defineKeys()), _mdwActions, "keys" ); // create widgets createWidgets(); /* !!! remove this for production version */ m_keys->insert( "Next Value", i18n( "Next Value" ), TQString(), - TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( nextEnumId() ) ); + TDEShortcut(), TDEShortcut(), this, TQ_SLOT( nextEnumId() ) ); installEventFilter( this ); // filter for popup } @@ -90,7 +90,7 @@ void MDWEnum::createWidgets() _label = new TQLabel( m_mixdevice->name(), this); _layout->addWidget(_label); _label->setFixedHeight(_label->sizeHint().height()); - _enumCombo = new KComboBox( FALSE, this, "mixerCombo" ); + _enumCombo = new KComboBox( false, this, "mixerCombo" ); // ------------ fill ComboBox start ------------ int maxEnumId= m_mixdevice->enumValues().count(); for (int i=0; i<maxEnumId; i++ ) { @@ -99,7 +99,7 @@ void MDWEnum::createWidgets() // ------------ fill ComboBox end -------------- _layout->addWidget(_enumCombo); _enumCombo->setFixedHeight(_enumCombo->sizeHint().height()); - connect( _enumCombo, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( setEnumId( int ) ) ); + connect( _enumCombo, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( setEnumId( int ) ) ); TQToolTip::add( _enumCombo, m_mixdevice->name() ); //_layout->addSpacing( 4 ); diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp index 6b493e48..acdcb2b6 100644 --- a/kmix/mdwslider.cpp +++ b/kmix/mdwslider.cpp @@ -25,7 +25,7 @@ #include <tdeconfig.h> #include <tdeaction.h> #include <tdepopupmenu.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <kkeydialog.h> #include <kdebug.h> @@ -64,29 +64,29 @@ MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md, { // create actions (on _mdwActions, see MixDeviceWidget) - new TDEToggleAction( i18n("&Split Channels"), 0, TQT_TQOBJECT(this), TQT_SLOT(toggleStereoLinked()), + new TDEToggleAction( i18n("&Split Channels"), 0, this, TQ_SLOT(toggleStereoLinked()), _mdwActions, "stereo" ); - new TDEToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" ); + new TDEToggleAction( i18n("&Hide"), 0, this, TQ_SLOT(setDisabled()), _mdwActions, "hide" ); TDEToggleAction *a = new TDEToggleAction(i18n("&Muted"), 0, 0, 0, _mdwActions, "mute" ); - connect( a, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleMuted()) ); + connect( a, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleMuted()) ); if( m_mixdevice->isRecordable() ) { a = new TDEToggleAction( i18n("Set &Record Source"), 0, 0, 0, _mdwActions, "recsrc" ); - connect( a, TQT_SIGNAL(toggled(bool)), TQT_SLOT( toggleRecsrc()) ); + connect( a, TQ_SIGNAL(toggled(bool)), TQ_SLOT( toggleRecsrc()) ); } - new TDEAction( i18n("C&onfigure Global Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" ); + new TDEAction( i18n("C&onfigure Global Shortcuts..."), 0, this, TQ_SLOT(defineKeys()), _mdwActions, "keys" ); // create widgets createWidgets( showMuteLED, showRecordLED ); m_keys->insert( "Increase volume", i18n( "Increase Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(), - TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) ); + TDEShortcut(), TDEShortcut(), this, TQ_SLOT( increaseVolume() ) ); m_keys->insert( "Decrease volume", i18n( "Decrease Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(), - TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( decreaseVolume() ) ); + TDEShortcut(), TDEShortcut(), this, TQ_SLOT( decreaseVolume() ) ); m_keys->insert( "Toggle mute", i18n( "Toggle Mute of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(), - TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleMuted() ) ); + TDEShortcut(), TDEShortcut(), this, TQ_SLOT( toggleMuted() ) ); installEventFilter( this ); // filter for popup @@ -232,7 +232,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) m_muteLED->resize( TQSize(16, 16) ); ledlayout->addWidget( m_muteLED ); TQToolTip::add( m_muteLED, i18n( "Mute" ) ); - connect( m_muteLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(toggleMuted()) ); + connect( m_muteLED, TQ_SIGNAL(stateChanged(bool)), this, TQ_SLOT(toggleMuted()) ); m_muteLED->installEventFilter( this ); ledlayout->addStretch(); } // has Mute LED @@ -316,7 +316,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) slinumLayout->addWidget( slider ); // add to layout m_sliders.append ( slider ); // add to list _slidersChids.append(chid); // Remember slider-chid association - connect( slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(volumeChange(int)) ); + connect( slider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(volumeChange(int)) ); } // for all channels of this device @@ -343,7 +343,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) KLed::Sunken, KLed::Circular, this, "RecordLED" ); m_recordLED->setFixedSize( TQSize(16, 16) ); reclayout->addWidget( m_recordLED ); - connect(m_recordLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(setRecsrc(bool))); + connect(m_recordLED, TQ_SIGNAL(stateChanged(bool)), this, TQ_SLOT(setRecsrc(bool))); m_recordLED->installEventFilter( this ); TQToolTip::add( m_recordLED, i18n( "Record" ) ); reclayout->addStretch(); @@ -908,7 +908,7 @@ void MDWSlider::showContextMenu() a = _mdwActions->action( "keys" ); if ( a && m_keys ) { - TDEActionSeparator sep( TQT_TQOBJECT(this) ); + TDEActionSeparator sep( this ); sep.plug( menu ); a->plug( menu ); } diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp index 48b918a3..8b62e6c1 100644 --- a/kmix/mdwswitch.cpp +++ b/kmix/mdwswitch.cpp @@ -30,7 +30,7 @@ #include <tdeconfig.h> #include <tdeaction.h> #include <tdepopupmenu.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <kkeydialog.h> #include <kdebug.h> @@ -54,14 +54,14 @@ MDWSwitch::MDWSwitch(Mixer *mixer, MixDevice* md, // create actions (on _mdwActions, see MixDeviceWidget) // KStdAction::showMenubar() is in MixDeviceWidget now - new TDEToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" ); - new TDEAction( i18n("C&onfigure Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" ); + new TDEToggleAction( i18n("&Hide"), 0, this, TQ_SLOT(setDisabled()), _mdwActions, "hide" ); + new TDEAction( i18n("C&onfigure Shortcuts..."), 0, this, TQ_SLOT(defineKeys()), _mdwActions, "keys" ); // create widgets createWidgets(); m_keys->insert( "Toggle switch", i18n( "Toggle Switch" ), TQString(), - TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleSwitch() ) ); + TDEShortcut(), TDEShortcut(), this, TQ_SLOT( toggleSwitch() ) ); // The keys are loaded in KMixerWidget::loadConfig, see kmixerwidget.cpp (now: kmixtoolbox.cpp) //m_keys->readSettings(); @@ -124,7 +124,7 @@ void MDWSwitch::createWidgets() _switchLED->installEventFilter( this ); _label->installEventFilter( this ); } - connect( _switchLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(toggleSwitch()) ); + connect( _switchLED, TQ_SIGNAL(stateChanged(bool)), this, TQ_SLOT(toggleSwitch()) ); _layout->addSpacing( 4 ); } diff --git a/kmix/mixdevicewidget.cpp b/kmix/mixdevicewidget.cpp index 889b19ac..81d7c4ed 100644 --- a/kmix/mixdevicewidget.cpp +++ b/kmix/mixdevicewidget.cpp @@ -25,7 +25,7 @@ #include <tdeconfig.h> #include <tdeaction.h> #include <tdepopupmenu.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <kkeydialog.h> #include <kdebug.h> @@ -59,7 +59,7 @@ MixDeviceWidget::MixDeviceWidget(Mixer *mixer, MixDevice* md, m_disabled( false ), _orientation( orientation ), m_small( small ) { _mdwActions = new TDEActionCollection( this ); - m_keys = new TDEGlobalAccel( TQT_TQOBJECT(this), "Keys" ); + m_keys = new TDEGlobalAccel( this, "Keys" ); } MixDeviceWidget::~MixDeviceWidget() diff --git a/kmix/mixer.cpp b/kmix/mixer.cpp index 150b196d..953afce9 100644 --- a/kmix/mixer.cpp +++ b/kmix/mixer.cpp @@ -89,7 +89,7 @@ Mixer::Mixer( int driver, int device ) : DCOPObject( "Mixer" ) m_profiles.setAutoDelete( true ); _pollingTimer = new TQTimer(); // will be started on open() and stopped on close() - connect( _pollingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(readSetFromHW())); + connect( _pollingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(readSetFromHW())); TQCString objid; #ifndef KMIX_DCOP_OBJID_TEST @@ -207,7 +207,7 @@ int Mixer::open() else { _mixerBackend->prepareSignalling(this); // poll once to give the GUI a chance to rebuild it's info - TQTimer::singleShot( 50, this, TQT_SLOT( readSetFromHW() ) ); + TQTimer::singleShot( 50, this, TQ_SLOT( readSetFromHW() ) ); } return err; } @@ -516,7 +516,7 @@ void Mixer::setVolume( int deviceidx, int percentage ) _mixerBackend->writeVolumeToHW(deviceidx, vol); // Make sure volume reading is synced readSetFromHWforceUpdate(); - TQTimer::singleShot(50, this, TQT_SLOT(readSetFromHW())); + TQTimer::singleShot(50, this, TQ_SLOT(readSetFromHW())); } /** @@ -534,7 +534,7 @@ void Mixer::commitVolumeChange( MixDevice* md ) { // Muting/unmuting PulseAudio directly does not send back any notification to the mixer // so we make sure we always update the tray icon after each operation. readSetFromHWforceUpdate(); - TQTimer::singleShot(50, this, TQT_SLOT(readSetFromHW())); + TQTimer::singleShot(50, this, TQ_SLOT(readSetFromHW())); } // @dcop only @@ -586,7 +586,7 @@ void Mixer::setAbsoluteVolume( int deviceidx, long absoluteVolume ) { _mixerBackend->writeVolumeToHW(deviceidx, vol); // Make sure volume reading is synced readSetFromHWforceUpdate(); - TQTimer::singleShot(50, this, TQT_SLOT(readSetFromHW())); + TQTimer::singleShot(50, this, TQ_SLOT(readSetFromHW())); } // @dcop , especially for use in KMilo diff --git a/kmix/mixer_alsa9.cpp b/kmix/mixer_alsa9.cpp index 22303b43..aaf6a109 100644 --- a/kmix/mixer_alsa9.cpp +++ b/kmix/mixer_alsa9.cpp @@ -418,7 +418,7 @@ void Mixer_ALSA::prepareSignalling( Mixer *mixer ) { kdDebug() << "socket " << i << endl; m_sns[i] = new TQSocketNotifier(m_fds[i].fd, TQSocketNotifier::Read); - mixer->connect(m_sns[i], TQT_SIGNAL(activated(int)), mixer, TQT_SLOT(readSetFromHW())); + mixer->connect(m_sns[i], TQ_SIGNAL(activated(int)), mixer, TQ_SLOT(readSetFromHW())); } } diff --git a/kmix/mixer_hpux.cpp b/kmix/mixer_hpux.cpp index 20ef91f3..0f491ac9 100644 --- a/kmix/mixer_hpux.cpp +++ b/kmix/mixer_hpux.cpp @@ -145,12 +145,12 @@ void Mixer_HPUX::setDevNumName_I(int devnum) */ bool Mixer_HPUX::setRecsrcHW( int devnum, bool on ) { - return FALSE; + return false; } bool Mixer_HPUX::isRecsrcHW( int devnum ) { - return FALSE; + return false; } int Mixer_HPUX::readVolumeFromHW( int devnum, Volume &vol ) diff --git a/kmix/mixer_sun.cpp b/kmix/mixer_sun.cpp index 12806bda..af5cfb8b 100644 --- a/kmix/mixer_sun.cpp +++ b/kmix/mixer_sun.cpp @@ -105,7 +105,7 @@ const uint_t MixerSunPortMasks[] = //====================================================================== -// FUNCTION/TQT_METHOD DEFINITIONS +// FUNCTION/METHOD DEFINITIONS //====================================================================== @@ -267,14 +267,14 @@ int Mixer_SUN::readVolumeFromHW( int devnum, Volume& volume ) break; case MIXERDEV_RECORD_MONITOR : - volume.setMuted(FALSE); + volume.setMuted(false); volume.setAllVolumes( audioinfo.monitor_gain ); break; case MIXERDEV_INTERNAL_SPEAKER : case MIXERDEV_HEADPHONE : case MIXERDEV_LINE_OUT : - volume.setMuted( (audioinfo.play.port & devMask) ? FALSE : TRUE ); + volume.setMuted( !(audioinfo.play.port & devMask) ); GainBalanceToVolume( audioinfo.play.gain, audioinfo.play.balance, volume ); @@ -283,7 +283,7 @@ int Mixer_SUN::readVolumeFromHW( int devnum, Volume& volume ) case MIXERDEV_MICROPHONE : case MIXERDEV_LINE_IN : case MIXERDEV_CD : - volume.setMuted( (audioinfo.record.port & devMask) ? FALSE : TRUE ); + volume.setMuted( !(audioinfo.record.port & devMask) ); GainBalanceToVolume( audioinfo.record.gain, audioinfo.record.balance, volume ); @@ -384,7 +384,7 @@ int Mixer_SUN::writeVolumeToHW( int devnum, Volume &volume ) //====================================================================== bool Mixer_SUN::setRecsrcHW( int /* devnum */, bool /* on */ ) { - return FALSE; + return false; } //====================================================================== @@ -398,10 +398,10 @@ bool Mixer_SUN::isRecsrcHW( int devnum ) case MIXERDEV_MICROPHONE : case MIXERDEV_LINE_IN : case MIXERDEV_CD : - return TRUE; + return true; default : - return FALSE; + return false; } } diff --git a/kmix/pics/CMakeLists.txt b/kmix/pics/CMakeLists.txt index 35ea82c5..92af67f8 100644 --- a/kmix/pics/CMakeLists.txt +++ b/kmix/pics/CMakeLists.txt @@ -16,8 +16,10 @@ install( FILES mix_microphone.png mix_midi.png mix_recmon.png mix_treble.png mix_unknown.png mix_volume.png mix_surround.png mix_video.png mix_headphone.png - mix_digital.png mix_ac97.png kmixdocked.png - kmixdocked_mute.png kmixdocked_error.png mix_record.png + mix_digital.png mix_ac97.png mix_record.png SpeakerFrontLeft.png SpeakerRearLeft.png SpeakerFrontRight.png SpeakerRearRight.png Listener.png DESTINATION ${DATA_INSTALL_DIR}/kmix/pics ) + +add_subdirectory(oldcrystal) +add_subdirectory(crystal)
\ No newline at end of file diff --git a/kmix/pics/crystal/CMakeLists.txt b/kmix/pics/crystal/CMakeLists.txt new file mode 100644 index 00000000..71f61d26 --- /dev/null +++ b/kmix/pics/crystal/CMakeLists.txt @@ -0,0 +1,13 @@ +################################################################################ +# Copyright © 2024 Mavridis Philippe <mavridisf@gmail.com> # +# # +# This file is released under the GNU GPL version 3 or later. # +# Improvements and feedback are welcome! # +################################################################################ + +set(theme "crystal") + +install(FILES audio-volume-error.png audio-volume-muted.png + audio-volume-low.png audio-volume-medium.png + audio-volume-high.png + DESTINATION ${DATA_INSTALL_DIR}/kmix/pics/${theme})
\ No newline at end of file diff --git a/kmix/pics/kmixdocked_error.png b/kmix/pics/crystal/audio-volume-error.png Binary files differindex b0497662..b0497662 100644 --- a/kmix/pics/kmixdocked_error.png +++ b/kmix/pics/crystal/audio-volume-error.png diff --git a/kmix/pics/crystal/audio-volume-high.png b/kmix/pics/crystal/audio-volume-high.png Binary files differnew file mode 100644 index 00000000..bfa7234b --- /dev/null +++ b/kmix/pics/crystal/audio-volume-high.png diff --git a/kmix/pics/crystal/audio-volume-low.png b/kmix/pics/crystal/audio-volume-low.png Binary files differnew file mode 100644 index 00000000..e42f7c8b --- /dev/null +++ b/kmix/pics/crystal/audio-volume-low.png diff --git a/kmix/pics/crystal/audio-volume-medium.png b/kmix/pics/crystal/audio-volume-medium.png Binary files differnew file mode 100644 index 00000000..4be127eb --- /dev/null +++ b/kmix/pics/crystal/audio-volume-medium.png diff --git a/kmix/pics/crystal/audio-volume-muted.png b/kmix/pics/crystal/audio-volume-muted.png Binary files differnew file mode 100644 index 00000000..8ceb8690 --- /dev/null +++ b/kmix/pics/crystal/audio-volume-muted.png diff --git a/kmix/pics/oldcrystal/CMakeLists.txt b/kmix/pics/oldcrystal/CMakeLists.txt new file mode 100644 index 00000000..47b37e11 --- /dev/null +++ b/kmix/pics/oldcrystal/CMakeLists.txt @@ -0,0 +1,13 @@ +################################################################################ +# Copyright © 2024 Mavridis Philippe <mavridisf@gmail.com> # +# # +# This file is released under the GNU GPL version 3 or later. # +# Improvements and feedback are welcome! # +################################################################################ + +set(theme "oldcrystal") + +install(FILES audio-volume-error.png audio-volume-muted.png + audio-volume-low.png audio-volume-medium.png + audio-volume-high.png + DESTINATION ${DATA_INSTALL_DIR}/kmix/pics/${theme})
\ No newline at end of file diff --git a/kmix/pics/oldcrystal/audio-volume-error.png b/kmix/pics/oldcrystal/audio-volume-error.png Binary files differnew file mode 100644 index 00000000..b0497662 --- /dev/null +++ b/kmix/pics/oldcrystal/audio-volume-error.png diff --git a/kmix/pics/oldcrystal/audio-volume-high.png b/kmix/pics/oldcrystal/audio-volume-high.png new file mode 120000 index 00000000..dd3d1eea --- /dev/null +++ b/kmix/pics/oldcrystal/audio-volume-high.png @@ -0,0 +1 @@ +audio-volume-low.png
\ No newline at end of file diff --git a/kmix/pics/kmixdocked.png b/kmix/pics/oldcrystal/audio-volume-low.png Binary files differindex 0c3f17d7..9e8997e5 100644 --- a/kmix/pics/kmixdocked.png +++ b/kmix/pics/oldcrystal/audio-volume-low.png diff --git a/kmix/pics/oldcrystal/audio-volume-medium.png b/kmix/pics/oldcrystal/audio-volume-medium.png new file mode 120000 index 00000000..dd3d1eea --- /dev/null +++ b/kmix/pics/oldcrystal/audio-volume-medium.png @@ -0,0 +1 @@ +audio-volume-low.png
\ No newline at end of file diff --git a/kmix/pics/kmixdocked_mute.png b/kmix/pics/oldcrystal/audio-volume-muted.png Binary files differindex 0dae0f15..70764025 100644 --- a/kmix/pics/kmixdocked_mute.png +++ b/kmix/pics/oldcrystal/audio-volume-muted.png diff --git a/kmix/viewapplet.cpp b/kmix/viewapplet.cpp index 4bebfdbc..ccd6080e 100644 --- a/kmix/viewapplet.cpp +++ b/kmix/viewapplet.cpp @@ -41,8 +41,8 @@ ViewApplet::ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBas { setBackgroundOrigin(AncestorOrigin); // remove the menu bar action, that is put by the "ViewBase" constructor in _actions. - //TDEToggleAction *m = static_cast<TDEToggleAction*>(KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBarSlot()), _actions )); - _actions->remove( KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBarSlot()), _actions) ); + //TDEToggleAction *m = static_cast<TDEToggleAction*>(KStdAction::showMenubar( this, TQ_SLOT(toggleMenuBarSlot()), _actions )); + _actions->remove( KStdAction::showMenubar(this, TQ_SLOT(toggleMenuBarSlot()), _actions) ); if ( position == KPanelApplet::pLeft || position == KPanelApplet::pRight ) { diff --git a/kmix/viewbase.cpp b/kmix/viewbase.cpp index 48a7ccb0..41d26f6a 100644 --- a/kmix/viewbase.cpp +++ b/kmix/viewbase.cpp @@ -51,7 +51,7 @@ ViewBase::ViewBase(TQWidget* parent, const char* name, const TQString & caption, // Plug in the "showMenubar" action, if the caller wants it. Typically this is only neccesary for views in the KMix main window. if ( vflags & ViewBase::HasMenuBar ) { - TDEToggleAction *m = static_cast<TDEToggleAction*>(KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBarSlot()), _actions )); + TDEToggleAction *m = static_cast<TDEToggleAction*>(KStdAction::showMenubar( this, TQ_SLOT(toggleMenuBarSlot()), _actions )); if ( vflags & ViewBase::MenuBarVisible ) { m->setChecked(true); } @@ -59,9 +59,9 @@ ViewBase::ViewBase(TQWidget* parent, const char* name, const TQString & caption, m->setChecked(false); } } - new TDEAction(i18n("&Channels"), 0, TQT_TQOBJECT(this), TQT_SLOT(configureView()), _actions, "toggle_channels"); - new TDEAction(i18n("&Select Mixer"), 0, TQT_TQOBJECT(this), TQT_SLOT(selectMixerSlot()), _actions, "select_mixer"); - connect ( _mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(refreshVolumeLevels()) ); + new TDEAction(i18n("&Channels"), 0, this, TQ_SLOT(configureView()), _actions, "toggle_channels"); + new TDEAction(i18n("&Select Mixer"), 0, this, TQ_SLOT(selectMixerSlot()), _actions, "select_mixer"); + connect ( _mixer, TQ_SIGNAL(newVolumeLevels()), this, TQ_SLOT(refreshVolumeLevels()) ); } ViewBase::~ViewBase() { diff --git a/kmix/viewdockareapopup.cpp b/kmix/viewdockareapopup.cpp index 21b5d8d9..79d8cfc4 100644 --- a/kmix/viewdockareapopup.cpp +++ b/kmix/viewdockareapopup.cpp @@ -137,7 +137,7 @@ TQWidget* ViewDockAreaPopup::add(MixDevice *md) // Add button to show main panel _showPanelBox = new TQPushButton( i18n("Mixer"), _frame, "MixerPanel" ); - connect ( _showPanelBox, TQT_SIGNAL( clicked() ), TQT_SLOT( showPanelSlot() ) ); + connect ( _showPanelBox, TQ_SIGNAL( clicked() ), TQ_SLOT( showPanelSlot() ) ); _layoutMDW->addMultiCellWidget( _showPanelBox, 1, 1, 0, 2 ); return _mdw; diff --git a/kmix/viewinput.cpp b/kmix/viewinput.cpp index eeadc61b..412b773b 100644 --- a/kmix/viewinput.cpp +++ b/kmix/viewinput.cpp @@ -29,7 +29,7 @@ ViewInput::ViewInput(TQWidget* parent, const char* name, const TQString & captio : ViewSliders(parent, name, caption, mixer, vflags) { init(); - connect ( _mixer, TQT_SIGNAL(newRecsrc()) , this, TQT_SLOT(refreshVolumeLevels()) ); // only the input widget has record sources + connect ( _mixer, TQ_SIGNAL(newRecsrc()) , this, TQ_SLOT(refreshVolumeLevels()) ); // only the input widget has record sources } ViewInput::~ViewInput() { diff --git a/krec/CMakeLists.txt b/krec/CMakeLists.txt index c5aadced..2c867eb6 100644 --- a/krec/CMakeLists.txt +++ b/krec/CMakeLists.txt @@ -62,8 +62,8 @@ tde_add_tdeinit_executable( krec AUTOMOC tdeutils-shared tdetexteditor-shared mcop kmedia2_idl soundserver_idl artsflow_idl artsmoduleseffects-shared artscontrolsupport-shared artsgui_kde-shared - krec_common-static ${DL_LIBRARIES} artskde-shared - ${ARTSC_LIBRARIES} pthread + krec_common-static ${CMAKE_DL_LIBS} artskde-shared + ${ARTSC_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/krec/krecconfig_files.cpp b/krec/krecconfig_files.cpp index 31df79aa..6d4d58a1 100644 --- a/krec/krecconfig_files.cpp +++ b/krec/krecconfig_files.cpp @@ -41,10 +41,10 @@ KRecConfigFiles::KRecConfigFiles( TQWidget* p, const char*, const TQStringList& _layout->addSpacing( 10 ); _filewidget = new KRecConfigFilesWidget( this ); - connect( _filewidget, TQT_SIGNAL( sRateChanged( int ) ), this, TQT_SLOT( ratechanged( int ) ) ); - connect( _filewidget, TQT_SIGNAL( sChannelsChanged( int ) ), this, TQT_SLOT( channelschanged( int ) ) ); - connect( _filewidget, TQT_SIGNAL( sBitsChanged( int ) ), this, TQT_SLOT( bitschanged( int ) ) ); - connect( _filewidget, TQT_SIGNAL( sUseDefaultsChanged( bool ) ), this, TQT_SLOT( usedefaultschanged( bool ) ) ); + connect( _filewidget, TQ_SIGNAL( sRateChanged( int ) ), this, TQ_SLOT( ratechanged( int ) ) ); + connect( _filewidget, TQ_SIGNAL( sChannelsChanged( int ) ), this, TQ_SLOT( channelschanged( int ) ) ); + connect( _filewidget, TQ_SIGNAL( sBitsChanged( int ) ), this, TQ_SLOT( bitschanged( int ) ) ); + connect( _filewidget, TQ_SIGNAL( sUseDefaultsChanged( bool ) ), this, TQ_SLOT( usedefaultschanged( bool ) ) ); _layout->addWidget( _filewidget ); _layout->addStretch( 100 ); diff --git a/krec/krecconfig_fileswidget.cpp b/krec/krecconfig_fileswidget.cpp index d396d41f..56e6a7c7 100644 --- a/krec/krecconfig_fileswidget.cpp +++ b/krec/krecconfig_fileswidget.cpp @@ -37,7 +37,7 @@ KRecConfigFilesWidget::KRecConfigFilesWidget( TQWidget* p, const char* n ) , _samplingRate( 44100 ), _channels( 2 ), _bits( 16 ) { _ratebox = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Sampling Rate" ), _hbox ); - connect( _ratebox, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( ratechanged( int ) ) ); + connect( _ratebox, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( ratechanged( int ) ) ); _rate48 = new TQRadioButton( i18n( "48000 Hz" ), _ratebox ); _rate44 = new TQRadioButton( i18n( "44100 Hz" ), _ratebox ); _rate22 = new TQRadioButton( i18n( "22050 Hz" ), _ratebox ); @@ -50,18 +50,18 @@ KRecConfigFilesWidget::KRecConfigFilesWidget( TQWidget* p, const char* n ) _rateotherline->setMaxLength( 10 ); _rateotherline->setFrame( true ); _rateotherbox->setEnabled( false ); - connect( _rateotherline, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( rateotherchanged( const TQString& ) ) ); + connect( _rateotherline, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( rateotherchanged( const TQString& ) ) ); _channelsbox = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Channels" ), _hbox ); - connect( _channelsbox, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( channelschanged( int ) ) ); + connect( _channelsbox, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( channelschanged( int ) ) ); _channels2 = new TQRadioButton( i18n( "Stereo (2 channels)" ), _channelsbox ); _channels1 = new TQRadioButton( i18n( "Mono (1 channel)" ), _channelsbox ); _bitsbox = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Bits" ), _hbox ); - connect( _bitsbox, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( bitschanged( int ) ) ); + connect( _bitsbox, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( bitschanged( int ) ) ); _bits16 = new TQRadioButton( i18n( "16 bit" ), _bitsbox ); _bits8 = new TQRadioButton( i18n( "8 bit" ), _bitsbox ); _usedefaults = new TQCheckBox( i18n( "Use defaults for creating new files" ), this ); - connect( _usedefaults, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( usedefaultschanged( bool ) ) ); + connect( _usedefaults, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( usedefaultschanged( bool ) ) ); setSpacing( 5 ); @@ -74,8 +74,8 @@ KRecConfigFilesWidget::~KRecConfigFilesWidget() { void KRecConfigFilesWidget::load() { kdDebug( 60005 ) << k_funcinfo << endl; defaults(); - kapp->config()->setGroup( "FileDefaults" ); - _samplingRate = kapp->config()->readNumEntry( "SamplingRate", 44100 ); + tdeApp->config()->setGroup( "FileDefaults" ); + _samplingRate = tdeApp->config()->readNumEntry( "SamplingRate", 44100 ); switch ( _samplingRate ) { case 48000: _rate48->setChecked( true ); break; case 44100: _rate44->setChecked( true ); break; @@ -87,29 +87,29 @@ kdDebug( 60005 ) << k_funcinfo << endl; _rateotherline->setText( TQString::number( _samplingRate ) ); break; }; - _channels = kapp->config()->readNumEntry( "Channels", 2 ); + _channels = tdeApp->config()->readNumEntry( "Channels", 2 ); switch ( _channels ) { default: case 2: _channels2->setChecked( true ); break; case 1: _channels1->setChecked( true ); break; }; - _bits = kapp->config()->readNumEntry( "Bits", 16 ); + _bits = tdeApp->config()->readNumEntry( "Bits", 16 ); switch ( _bits ) { default: case 16: _bits16->setChecked( true ); break; case 8: _bits8->setChecked( true ); break; }; - _usedefaults->setChecked( kapp->config()->readBoolEntry( "UseDefaults", false ) ); + _usedefaults->setChecked( tdeApp->config()->readBoolEntry( "UseDefaults", false ) ); } void KRecConfigFilesWidget::save() { - kapp->config()->setGroup( "FileDefaults" ); - kapp->config()->writeEntry( "SamplingRate", _samplingRate ); - kapp->config()->writeEntry( "Channels", _channels ); - kapp->config()->writeEntry( "Bits", _bits ); - kapp->config()->writeEntry( "UseDefaults", _usedefaults->isOn() ); + tdeApp->config()->setGroup( "FileDefaults" ); + tdeApp->config()->writeEntry( "SamplingRate", _samplingRate ); + tdeApp->config()->writeEntry( "Channels", _channels ); + tdeApp->config()->writeEntry( "Bits", _bits ); + tdeApp->config()->writeEntry( "UseDefaults", _usedefaults->isOn() ); - kapp->config()->sync(); + tdeApp->config()->sync(); } void KRecConfigFilesWidget::defaults() { diff --git a/krec/krecconfigure.cpp b/krec/krecconfigure.cpp index 32e0dafa..04311206 100644 --- a/krec/krecconfigure.cpp +++ b/krec/krecconfigure.cpp @@ -55,14 +55,14 @@ KRecConfigGeneral::KRecConfigGeneral( TQWidget* p, const char*, const TQStringLi _displaybox = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Timedisplay Style" ), this ); _layout_display->addWidget( _displaybox, 100 ); - connect( _displaybox, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( displaychanged( int ) ) ); + connect( _displaybox, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( displaychanged( int ) ) ); _display0 = new TQRadioButton( i18n( "Plain samples" ), _displaybox ); _display1 = new TQRadioButton( i18n( "[hours:]mins:secs:samples" ), _displaybox ); _display2 = new TQRadioButton( i18n( "[hours:]mins:secs:frames" ), _displaybox ); _display3 = new TQRadioButton( i18n( "MByte.KByte" ), _displaybox ); _framebasebox = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Framebase" ), this ); _layout_display->addWidget( _framebasebox, 100 ); - connect( _framebasebox, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( framebasechanged( int ) ) ); + connect( _framebasebox, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( framebasechanged( int ) ) ); _framebase30 = new TQRadioButton( i18n( "30 frames per second (American TV)" ), _framebasebox ); _framebase25 = new TQRadioButton( i18n( "25 frames per second (European TV)" ), _framebasebox ); _framebase75 = new TQRadioButton( i18n( "75 frames per second (CD)" ), _framebasebox ); @@ -73,11 +73,11 @@ KRecConfigGeneral::KRecConfigGeneral( TQWidget* p, const char*, const TQStringLi _framebaseotherline = new TQLineEdit( _framebaseotherbox ); _framebaseotherline->setMaxLength( 10 ); _framebaseotherbox->setEnabled( false ); - connect( _framebaseotherline, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( framebaseotherchanged( const TQString& ) ) ); + connect( _framebaseotherline, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( framebaseotherchanged( const TQString& ) ) ); _layout->addSpacing( 5 ); _verboseDisplayMode = new TQCheckBox( i18n( "Show verbose times ( XXmins:XXsecs:XXframes instead of XX:XX::XX )" ), this ); - connect( _verboseDisplayMode, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( verboseDisplayChanged( bool ) ) ); + connect( _verboseDisplayMode, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( verboseDisplayChanged( bool ) ) ); _layout->addWidget( _verboseDisplayMode ); _layout->addSpacing( 10 ); @@ -85,11 +85,11 @@ KRecConfigGeneral::KRecConfigGeneral( TQWidget* p, const char*, const TQStringLi _layout->addWidget( _other_title ); _tipofday = new TQCheckBox( i18n( "Show tip of the day at startup" ), this ); - connect( _tipofday, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( tipofdaychanged( bool ) ) ); + connect( _tipofday, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( tipofdaychanged( bool ) ) ); _layout->addWidget( _tipofday ); TQBoxLayout* _tmplayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); _enableAllMessages = new KPushButton( i18n( "Enable All Hidden Messages" ), this ); - connect( _enableAllMessages, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableallmessagesclicked() ) ); + connect( _enableAllMessages, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableallmessagesclicked() ) ); _tmplayout->addWidget( _enableAllMessages ); TQLabel* _tmplbl = new TQLabel( i18n( "<qt><i>All messages with the \"Don't show this message again\" option are shown again after selecting this button.</i></qt>" ), this ); _tmplayout->addWidget( _tmplbl ); @@ -127,8 +127,8 @@ kdDebug( 60005 ) << k_funcinfo << endl; _framebaseotherline->setText( TQString::number( _framebase ) ); break; }; - kapp->config()->setGroup( "TipOfDay" ); - _tip = kapp->config()->readBoolEntry( "RunOnStart", true ); + tdeApp->config()->setGroup( "TipOfDay" ); + _tip = tdeApp->config()->readBoolEntry( "RunOnStart", true ); _tipofday->setChecked( _tip ); } @@ -137,10 +137,10 @@ void KRecConfigGeneral::save() { KRecGlobal::the()->setFrameBase( _framebase ); kdDebug(60005) << k_funcinfo << "Framebase=" << _framebase << endl; - kapp->config()->setGroup( "TipOfDay" ); - kapp->config()->writeEntry( "RunOnStart", _tip ); + tdeApp->config()->setGroup( "TipOfDay" ); + tdeApp->config()->writeEntry( "RunOnStart", _tip ); - kapp->config()->sync(); + tdeApp->config()->sync(); emit changed( false ); } diff --git a/krec/krecexport_template.cpp b/krec/krecexport_template.cpp index 05a19d2b..2a76cf2a 100644 --- a/krec/krecexport_template.cpp +++ b/krec/krecexport_template.cpp @@ -57,7 +57,7 @@ kdDebug( 60005 ) << k_funcinfo << endl; if ( !running() ) { if ( process() ) { _running = true; - TQTimer::singleShot( 0, this, TQT_SLOT( process() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( process() ) ); emit running( running() ); } return true; diff --git a/krec/krecexport_wave.cpp b/krec/krecexport_wave.cpp index 6de79d3d..c7f3e18a 100644 --- a/krec/krecexport_wave.cpp +++ b/krec/krecexport_wave.cpp @@ -69,7 +69,7 @@ bool KRecExport_Wave::process() { TQByteArray bytearray( 4096 ); emit getData( bytearray ); _file->writeBlock( bytearray ); - TQTimer::singleShot( 10, this, TQT_SLOT( process() ) ); + TQTimer::singleShot( 10, this, TQ_SLOT( process() ) ); } return true; } else return false; diff --git a/krec/krecfile.cpp b/krec/krecfile.cpp index 864b4c43..08faa7d2 100644 --- a/krec/krecfile.cpp +++ b/krec/krecfile.cpp @@ -25,7 +25,7 @@ #include <ktar.h> #include <tdeio/job.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tqdir.h> #include <tqfileinfo.h> #include <tdemessagebox.h> @@ -40,7 +40,7 @@ void KRecFile::init() { _filename = TQString(); _currentBuffer = 0; _dir = new KTempDir(); - _config = new KSimpleConfig( _dir->name()+"project.rc", false ); + _config = new TDESimpleConfig( _dir->name()+"project.rc", false ); } KRecFile::KRecFile( TQObject* p, const char* n ) @@ -85,7 +85,7 @@ KRecFile::KRecFile( const TQString &filename, TQObject* p, const char* n ) dir->copyTo( _dir->name() ); delete _config; - _config = new KSimpleConfig( _dir->name()+"project.rc", false ); + _config = new TDESimpleConfig( _dir->name()+"project.rc", false ); loadProps(); int c = _config->readNumEntry( "Files" ); //kdDebug( 60005 ) << c << " Files to load" << endl; @@ -258,9 +258,9 @@ void KRecFile::newBuffer( const TQString &filename ) { } void KRecFile::newBuffer( KRecBuffer* buffer ) { kdDebug( 60005 ) << k_funcinfo << endl; - connect( buffer, TQT_SIGNAL( posChanged( KRecBuffer*, TQIODevice::Offset ) ), this, TQT_SLOT( newPos( KRecBuffer*, TQIODevice::Offset ) ) ); - connect( buffer, TQT_SIGNAL( sizeChanged( KRecBuffer*, TQIODevice::Offset ) ), this, TQT_SLOT( newSize( KRecBuffer*, TQIODevice::Offset ) ) ); - connect( buffer, TQT_SIGNAL( deleteSelf( KRecBuffer* ) ), this, TQT_SLOT( deleteBuffer( KRecBuffer* ) ) ); + connect( buffer, TQ_SIGNAL( posChanged( KRecBuffer*, TQIODevice::Offset ) ), this, TQ_SLOT( newPos( KRecBuffer*, TQIODevice::Offset ) ) ); + connect( buffer, TQ_SIGNAL( sizeChanged( KRecBuffer*, TQIODevice::Offset ) ), this, TQ_SLOT( newSize( KRecBuffer*, TQIODevice::Offset ) ) ); + connect( buffer, TQ_SIGNAL( deleteSelf( KRecBuffer* ) ), this, TQ_SLOT( deleteBuffer( KRecBuffer* ) ) ); _buffers.append( buffer ); newSize( buffer, buffer->size() ); _currentBuffer = _buffers.findIndex( buffer ); diff --git a/krec/krecfile.h b/krec/krecfile.h index 86c29c77..ae9e7337 100644 --- a/krec/krecfile.h +++ b/krec/krecfile.h @@ -22,7 +22,7 @@ class KRecBuffer; class KTempDir; -class KSimpleConfig; +class TDESimpleConfig; class TQFile; class KRecFileViewWidget; @@ -112,7 +112,7 @@ private: int _currentBuffer; TQValueList<KRecBuffer*> _buffers; KTempDir *_dir; - KSimpleConfig *_config; + TDESimpleConfig *_config; int _pos, _size; void init(); diff --git a/krec/krecfileview.cpp b/krec/krecfileview.cpp index bdf62adb..5c9f4c06 100644 --- a/krec/krecfileview.cpp +++ b/krec/krecfileview.cpp @@ -57,15 +57,15 @@ kdDebug( 60005 ) << k_funcinfo << file << endl; if ( _file ) { if ( !_file->filename().isNull() ) setFilename( _file->filename() ); else _filename->setText( i18n( "file with no name" ) ); - connect( _file, TQT_SIGNAL( posChanged( int ) ), this, TQT_SLOT( setPos( int ) ) ); - connect( _file, TQT_SIGNAL( posChanged( int ) ), _timebar, TQT_SLOT( newPos( int ) ) ); - connect( _file, TQT_SIGNAL( posChanged( int ) ), _timedisplay, TQT_SLOT( newPos( int ) ) ); - connect( _file, TQT_SIGNAL( sizeChanged( int ) ), this, TQT_SLOT( setSize( int ) ) ); - connect( _file, TQT_SIGNAL( sizeChanged( int ) ), _timebar, TQT_SLOT( newSize( int ) ) ); - connect( _file, TQT_SIGNAL( sizeChanged( int ) ), _timedisplay, TQT_SLOT( newSize( int ) ) ); - connect( _file, TQT_SIGNAL( filenameChanged( const TQString &) ), this, TQT_SLOT( setFilename( const TQString &) ) ); - connect( _file, TQT_SIGNAL( filenameChanged( const TQString &) ), _timedisplay, TQT_SLOT( newFilename( const TQString &) ) ); - connect( _timebar, TQT_SIGNAL( sNewPos( int ) ), _file, TQT_SLOT( newPos( int ) ) ); + connect( _file, TQ_SIGNAL( posChanged( int ) ), this, TQ_SLOT( setPos( int ) ) ); + connect( _file, TQ_SIGNAL( posChanged( int ) ), _timebar, TQ_SLOT( newPos( int ) ) ); + connect( _file, TQ_SIGNAL( posChanged( int ) ), _timedisplay, TQ_SLOT( newPos( int ) ) ); + connect( _file, TQ_SIGNAL( sizeChanged( int ) ), this, TQ_SLOT( setSize( int ) ) ); + connect( _file, TQ_SIGNAL( sizeChanged( int ) ), _timebar, TQ_SLOT( newSize( int ) ) ); + connect( _file, TQ_SIGNAL( sizeChanged( int ) ), _timedisplay, TQ_SLOT( newSize( int ) ) ); + connect( _file, TQ_SIGNAL( filenameChanged( const TQString &) ), this, TQ_SLOT( setFilename( const TQString &) ) ); + connect( _file, TQ_SIGNAL( filenameChanged( const TQString &) ), _timedisplay, TQ_SLOT( newFilename( const TQString &) ) ); + connect( _timebar, TQ_SIGNAL( sNewPos( int ) ), _file, TQ_SLOT( newPos( int ) ) ); _timebar->newPos( _file->position() ); _timebar->newSize( _file->size() ); _timedisplay->newSamplingRate( _file->samplerate() ); @@ -75,7 +75,7 @@ kdDebug( 60005 ) << k_funcinfo << file << endl; _timedisplay->newPos( _file->position() ); _timedisplay->newSize( _file->size() ); } else { - disconnect( this, TQT_SLOT( setPos( TQIODevice::Offset ) ) ); + disconnect( this, TQ_SLOT( setPos( TQIODevice::Offset ) ) ); _filename->setText( i18n( "<no file>" ) ); _timedisplay->newFilename( TQString() ); } diff --git a/krec/krecfileviewhelpers.cpp b/krec/krecfileviewhelpers.cpp index 8a177e20..4757078f 100644 --- a/krec/krecfileviewhelpers.cpp +++ b/krec/krecfileviewhelpers.cpp @@ -80,9 +80,9 @@ KRecTimeDisplay::KRecTimeDisplay( TQWidget* p, const char* n ) , _samplingRate( 44100 ), _bits( 16 ), _channels( 2 ) { _position = new AKLabel( this ); - connect( _position, TQT_SIGNAL( showContextMenu( const TQPoint & ) ), this, TQT_SLOT( timeContextMenu( const TQPoint &) ) ); + connect( _position, TQ_SIGNAL( showContextMenu( const TQPoint & ) ), this, TQ_SLOT( timeContextMenu( const TQPoint &) ) ); _size = new AKLabel( this ); - connect( _size, TQT_SIGNAL( showContextMenu( const TQPoint &) ), this, TQT_SLOT( sizeContextMenu( const TQPoint &) ) ); + connect( _size, TQ_SIGNAL( showContextMenu( const TQPoint &) ), this, TQ_SLOT( sizeContextMenu( const TQPoint &) ) ); _layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight, 0, 2 ); _layout->addStretch( 100 ); diff --git a/krec/krecfilewidgets.cpp b/krec/krecfilewidgets.cpp index a0c2180d..c626a961 100644 --- a/krec/krecfilewidgets.cpp +++ b/krec/krecfilewidgets.cpp @@ -64,8 +64,8 @@ kdDebug( 60005 ) << k_funcinfo << file << endl; for ( TQValueList<KRecBuffer*>::iterator it = _file->_buffers.begin(); it != _file->_buffers.end(); ++it ) { newBuffer( ( *it ) ); } - connect( _file, TQT_SIGNAL( sNewBuffer( KRecBuffer* ) ), TQT_TQOBJECT(this), TQT_SLOT( newBuffer( KRecBuffer* ) ) ); - connect( _file, TQT_SIGNAL( sDeleteBuffer( KRecBuffer* ) ), TQT_TQOBJECT(this), TQT_SLOT( deleteBuffer( KRecBuffer* ) ) ); + connect( _file, TQ_SIGNAL( sNewBuffer( KRecBuffer* ) ), this, TQ_SLOT( newBuffer( KRecBuffer* ) ) ); + connect( _file, TQ_SIGNAL( sDeleteBuffer( KRecBuffer* ) ), this, TQ_SLOT( deleteBuffer( KRecBuffer* ) ) ); //kdDebug( 60005 ) << _file->_currentBuffer << endl; } } @@ -98,7 +98,7 @@ void KRecFileWidget::mouseReleaseEvent( TQMouseEvent* qme ) { void KRecFileWidget::newBuffer( KRecBuffer* buffer ) { //kdDebug( 60005 ) << k_funcinfo << buffer << endl; KRecBufferWidget *tmp = new KRecBufferWidget( buffer, this ); - connect( tmp, TQT_SIGNAL( popupMenu( KRecBufferWidget*, TQPoint ) ), TQT_TQOBJECT(this), TQT_SLOT( popupMenu( KRecBufferWidget*, TQPoint ) ) ); + connect( tmp, TQ_SIGNAL( popupMenu( KRecBufferWidget*, TQPoint ) ), this, TQ_SLOT( popupMenu( KRecBufferWidget*, TQPoint ) ) ); bufferwidgets.append( tmp ); tmp->show(); resizeEvent(); @@ -119,12 +119,12 @@ void KRecFileWidget::deleteBuffer( KRecBuffer* buffer ) { void KRecFileWidget::popupMenu( KRecBufferWidget* bw, TQPoint pos ) { TDEPopupMenu tmp( this ); - TDEToggleAction* _activeaction = new TDEToggleAction( i18n( "Toggle Active/Disabled State" ), TDEShortcut(), TQT_TQOBJECT(this) ); + TDEToggleAction* _activeaction = new TDEToggleAction( i18n( "Toggle Active/Disabled State" ), TDEShortcut(), this ); _activeaction->setChecked( bw->buffer()->active() ); - connect( _activeaction, TQT_SIGNAL( toggled( bool ) ), bw->buffer(), TQT_SLOT( setActive( bool ) ) ); - TDEAction* _removeaction = new TDEAction( i18n( "Remove This Part" ), "fileremove", TDEShortcut(), bw->buffer(), TQT_SLOT( deleteBuffer() ), TQT_TQOBJECT(this) ); - TDEAction* _changetitle = new TDEAction( i18n( "Change Title of This Part" ), TDEShortcut(), TQT_TQOBJECT(bw), TQT_SLOT( changeTitle() ), TQT_TQOBJECT(this) ); - TDEAction* _changecomment = new TDEAction( i18n( "Change Comment of This Part" ), TDEShortcut(), TQT_TQOBJECT(bw), TQT_SLOT( changeComment() ), TQT_TQOBJECT(this) ); + connect( _activeaction, TQ_SIGNAL( toggled( bool ) ), bw->buffer(), TQ_SLOT( setActive( bool ) ) ); + TDEAction* _removeaction = new TDEAction( i18n( "Remove This Part" ), "fileremove", TDEShortcut(), bw->buffer(), TQ_SLOT( deleteBuffer() ), this ); + TDEAction* _changetitle = new TDEAction( i18n( "Change Title of This Part" ), TDEShortcut(), bw, TQ_SLOT( changeTitle() ), this ); + TDEAction* _changecomment = new TDEAction( i18n( "Change Comment of This Part" ), TDEShortcut(), bw, TQ_SLOT( changeComment() ), this ); _activeaction->plug( &tmp ); _changetitle->plug( &tmp ); _changecomment->plug( &tmp ); @@ -147,7 +147,7 @@ KRecBufferWidget::KRecBufferWidget( KRecBuffer* buffer, TQWidget* p, const char* , _main_region( 0 ), _title_region( 0 ), _fileend_region( 0 ) , alreadyreadsize( 0 ) { - connect( _buffer, TQT_SIGNAL( somethingChanged() ), TQT_TQOBJECT(this), TQT_SLOT( update() ) ); + connect( _buffer, TQ_SIGNAL( somethingChanged() ), this, TQ_SLOT( update() ) ); kdDebug( 60005 ) << k_funcinfo << endl; } KRecBufferWidget::~KRecBufferWidget() { diff --git a/krec/krecglobal.cpp b/krec/krecglobal.cpp index 3c0191de..4e852eac 100644 --- a/krec/krecglobal.cpp +++ b/krec/krecglobal.cpp @@ -51,7 +51,7 @@ KRecGlobal* KRecGlobal::the() { void KRecGlobal::setMainWidget( TQWidget* n ) { _qwidget = n; } TQWidget* KRecGlobal::mainWidget() { return _qwidget; } -TDEConfig* KRecGlobal::tdeconfig() { return kapp->config(); } +TDEConfig* KRecGlobal::tdeconfig() { return tdeApp->config(); } void KRecGlobal::setStatusBar( KStatusBar *bar ) { _statusbar = bar; } void KRecGlobal::message( const TQString &text ) { if ( _statusbar ) _statusbar->message( text, 2000 ); } @@ -104,27 +104,27 @@ KRecExportItem* KRecGlobal::getExportItemForEnding( const TQString &ending ) { int KRecGlobal::timeFormatMode() { if ( _timeformatcache < 0 ) { - kapp->config()->setGroup( "General" ); - _timeformatcache = kapp->config()->readNumEntry( "TimeFormat", 0 ); + tdeApp->config()->setGroup( "General" ); + _timeformatcache = tdeApp->config()->readNumEntry( "TimeFormat", 0 ); } return _timeformatcache; } void KRecGlobal::setTimeFormatMode( int n ) { - kapp->config()->setGroup( "General" ); - kapp->config()->writeEntry( "TimeFormat", n ); + tdeApp->config()->setGroup( "General" ); + tdeApp->config()->writeEntry( "TimeFormat", n ); _timeformatcache = n; } int KRecGlobal::frameBase() { if ( _framebasecache < 0 ) { - kapp->config()->setGroup( "General" ); - _framebasecache = kapp->config()->readNumEntry( "FrameBase", 25 ); + tdeApp->config()->setGroup( "General" ); + _framebasecache = tdeApp->config()->readNumEntry( "FrameBase", 25 ); } return _framebasecache; } void KRecGlobal::setFrameBase( int n ) { - kapp->config()->setGroup( "General" ); - kapp->config()->writeEntry( "FrameBase", n ); + tdeApp->config()->setGroup( "General" ); + tdeApp->config()->writeEntry( "FrameBase", n ); _framebasecache = n; } diff --git a/krec/krecglobal.h b/krec/krecglobal.h index 4cb57681..4daa3dab 100644 --- a/krec/krecglobal.h +++ b/krec/krecglobal.h @@ -50,7 +50,7 @@ public: */ TQWidget* mainWidget(); - /// @return kapp->config() + /// @return tdeApp->config() static TDEConfig* tdeconfig(); /// Sets the Statusbar. diff --git a/krec/krecnewproperties.cpp b/krec/krecnewproperties.cpp index 8f5f7385..ecc9bf4c 100644 --- a/krec/krecnewproperties.cpp +++ b/krec/krecnewproperties.cpp @@ -57,16 +57,16 @@ kdDebug( 60005 ) << k_funcinfo << endl; _layout->addWidget( captionlabel ); _filewidget = new KRecConfigFilesWidget( this ); - connect( _filewidget, TQT_SIGNAL( sRateChanged( int ) ), this, TQT_SLOT( ratechanged( int ) ) ); - connect( _filewidget, TQT_SIGNAL( sChannelsChanged( int ) ), this, TQT_SLOT( channelschanged( int ) ) ); - connect( _filewidget, TQT_SIGNAL( sBitsChanged( int ) ), this, TQT_SLOT( bitschanged( int ) ) ); - connect( _filewidget, TQT_SIGNAL( sUseDefaultsChanged( bool ) ), this, TQT_SLOT( usedefaultschanged( bool ) ) ); + connect( _filewidget, TQ_SIGNAL( sRateChanged( int ) ), this, TQ_SLOT( ratechanged( int ) ) ); + connect( _filewidget, TQ_SIGNAL( sChannelsChanged( int ) ), this, TQ_SLOT( channelschanged( int ) ) ); + connect( _filewidget, TQ_SIGNAL( sBitsChanged( int ) ), this, TQ_SLOT( bitschanged( int ) ) ); + connect( _filewidget, TQ_SIGNAL( sUseDefaultsChanged( bool ) ), this, TQ_SLOT( usedefaultschanged( bool ) ) ); TQWidget *_btnWidget = new TQWidget( this ); _layoutbuttons = new TQHBoxLayout( _btnWidget ); _layoutbuttons->addStretch( 100 ); _btnok = new KPushButton( KStdGuiItem::ok(), _btnWidget ); - connect( _btnok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); + connect( _btnok, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); _layoutbuttons->addWidget( _btnok, 0 ); _layout->addWidget( new KSeparator( KSeparator::HLine, this ) ); diff --git a/krec/krecord.cpp b/krec/krecord.cpp index 324d1d01..d4ac5413 100644 --- a/krec/krecord.cpp +++ b/krec/krecord.cpp @@ -107,8 +107,8 @@ void KRecPrivate::openFile() { } void KRecPrivate::pNewFile( KRecFile* file ) { _currentFile = file; - connect( m_recStream, TQT_SIGNAL( data( TQByteArray& ) ), _currentFile, TQT_SLOT( writeData( TQByteArray& ) ) ); - connect( m_playStream, TQT_SIGNAL( requestData( TQByteArray& ) ), _currentFile, TQT_SLOT( getData( TQByteArray& ) ) ); + connect( m_recStream, TQ_SIGNAL( data( TQByteArray& ) ), _currentFile, TQ_SLOT( writeData( TQByteArray& ) ) ); + connect( m_playStream, TQ_SIGNAL( requestData( TQByteArray& ) ), _currentFile, TQ_SLOT( getData( TQByteArray& ) ) ); mainwidget->_fileview->setFile( _currentFile ); checkActions(); } @@ -162,9 +162,9 @@ void KRecPrivate::exportFile() { if ( _exportitem ) { _exportitem->initialize( _currentFile->samplerate(), _currentFile->bits(), _currentFile->channels() ); if ( _exportitem->initialize( filename ) ) { - connect( _exportitem, TQT_SIGNAL( getData( TQByteArray& ) ), _currentFile, TQT_SLOT( getData( TQByteArray& ) ) ); - connect( _currentFile, TQT_SIGNAL( endReached() ), _exportitem, TQT_SLOT( stop() ) ); - connect( _currentFile, TQT_SIGNAL( endReached() ), TQT_TQOBJECT(this), TQT_SLOT( endExportFile() ) ); + connect( _exportitem, TQ_SIGNAL( getData( TQByteArray& ) ), _currentFile, TQ_SLOT( getData( TQByteArray& ) ) ); + connect( _currentFile, TQ_SIGNAL( endReached() ), _exportitem, TQ_SLOT( stop() ) ); + connect( _currentFile, TQ_SIGNAL( endReached() ), this, TQ_SLOT( endExportFile() ) ); _exportitem->start(); } } else @@ -185,7 +185,7 @@ void KRecPrivate::exportFile() { } else KRecGlobal::the()->message( i18n( "There is nothing to export." ) ); checkActions(); } -void KRecPrivate::endExportFile() { TQTimer::singleShot( 20, TQT_TQOBJECT(this), TQT_SLOT( endExportFile2() ) ); } +void KRecPrivate::endExportFile() { TQTimer::singleShot( 20, this, TQ_SLOT( endExportFile2() ) ); } void KRecPrivate::endExportFile2() { _exportitem->finalize(); disconnect( _currentFile, 0, _exportitem, 0 ); @@ -252,10 +252,10 @@ void KRecPrivate::forceTipOfDay() { } void KRecPrivate::execaRtsControl() { - kapp->tdeinitExec( "artscontrol" ); + tdeApp->tdeinitExec( "artscontrol" ); } void KRecPrivate::execKMix() { - kapp->tdeinitExec( "kmix" ); + tdeApp->tdeinitExec( "kmix" ); } /** @@ -283,40 +283,40 @@ KRecord::KRecord(TQWidget *parent, const char *name ) // * * * Actions * * * d->artsactions = new ArtsActions( d->server, actionCollection(), this ); - KStdAction::preferences( d, TQT_SLOT( showConfDialog() ), actionCollection() ); + KStdAction::preferences( d, TQ_SLOT( showConfDialog() ), actionCollection() ); - KStdAction::openNew( d, TQT_SLOT( newFile() ), actionCollection() ); - KStdAction::open( d, TQT_SLOT( openFile() ), actionCollection() ); - KStdAction::save( d, TQT_SLOT( saveFile() ), actionCollection() ); - KStdAction::saveAs( d, TQT_SLOT( saveAsFile() ), actionCollection() ); - KStdAction::close( d, TQT_SLOT( closeFile() ), actionCollection() ); - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); + KStdAction::openNew( d, TQ_SLOT( newFile() ), actionCollection() ); + KStdAction::open( d, TQ_SLOT( openFile() ), actionCollection() ); + KStdAction::save( d, TQ_SLOT( saveFile() ), actionCollection() ); + KStdAction::saveAs( d, TQ_SLOT( saveAsFile() ), actionCollection() ); + KStdAction::close( d, TQ_SLOT( closeFile() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); - KStdAction::tipOfDay( d, TQT_SLOT( forceTipOfDay() ), actionCollection() ); + KStdAction::tipOfDay( d, TQ_SLOT( forceTipOfDay() ), actionCollection() ); d->aExportFile = new TDEAction( i18n( "Export..." ), TDEShortcut(), - d, TQT_SLOT( exportFile() ), actionCollection(), "export_file" ); + d, TQ_SLOT( exportFile() ), actionCollection(), "export_file" ); d->aRecord = new TDEAction( i18n( "&Record" ), TDEShortcut( Key_R ), - TQT_TQOBJECT(this), TQT_SLOT( startRec() ), actionCollection(), "player_record" ); + this, TQ_SLOT( startRec() ), actionCollection(), "player_record" ); d->aPlay = new TDEAction( i18n( "&Play" ), TDEShortcut( Key_P ), - TQT_TQOBJECT(this), TQT_SLOT( startPlay() ), actionCollection(), "media-playback-start" ); + this, TQ_SLOT( startPlay() ), actionCollection(), "media-playback-start" ); d->aStop = new TDEAction( i18n( "&Stop" ), TDEShortcut( Key_S ), - TQT_TQOBJECT(this), TQT_SLOT( stopRec() ), actionCollection(), "media-playback-stop" ); + this, TQ_SLOT( stopRec() ), actionCollection(), "media-playback-stop" ); d->aThru = new TDEToggleAction( i18n( "Play Through" ), TDEShortcut( CTRL + Key_P), actionCollection(), "play_thru" ); - connect( d->aThru, TQT_SIGNAL( toggled( bool ) ), d, TQT_SLOT( playthru( bool ) ) ); + connect( d->aThru, TQ_SIGNAL( toggled( bool ) ), d, TQ_SLOT( playthru( bool ) ) ); d->aBegin = new TDEAction( i18n( "Go to &Beginning" ), TDEShortcut( SHIFT + Key_Left ), - d, TQT_SLOT( toBegin() ), actionCollection(), "player_gobegin" ); + d, TQ_SLOT( toBegin() ), actionCollection(), "player_gobegin" ); d->aEnd = new TDEAction( i18n( "Go to &End" ), TDEShortcut( SHIFT + Key_Right ), - d, TQT_SLOT( toEnd() ), actionCollection(), "player_goend" ); + d, TQ_SLOT( toEnd() ), actionCollection(), "player_goend" ); ( void* ) d->artsactions->actionAudioManager(); d->aExecaRtsControl = new TDEAction( i18n( "Start aRts Control Tool" ), TDEShortcut(), - d, TQT_SLOT( execaRtsControl() ), actionCollection(), "exec_artscontrol" ); + d, TQ_SLOT( execaRtsControl() ), actionCollection(), "exec_artscontrol" ); d->aExecKMix = new TDEAction( i18n( "Start KMix" ), TDEShortcut(), - d, TQT_SLOT( execKMix() ), actionCollection(), "exec_kmix" ); + d, TQ_SLOT( execKMix() ), actionCollection(), "exec_kmix" ); // * * * GUI * * * // TODO Fix toolbar config so this line can just be setupGUI() diff --git a/krec/main.cpp b/krec/main.cpp index 5c3a67fb..d294630d 100644 --- a/krec/main.cpp +++ b/krec/main.cpp @@ -40,7 +40,7 @@ static TDECmdLineOptions options[] = // INSERT YOUR COMMANDLINE OPTIONS HERE }; -extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) +extern "C" TDE_EXPORT int kdemain( int argc, char* argv[] ) { //cout<<endl<<"Starting kRec..."<<endl; diff --git a/krec/mp3_export/krecexport_mp3.cpp b/krec/mp3_export/krecexport_mp3.cpp index d337dafc..a40c5b1f 100644 --- a/krec/mp3_export/krecexport_mp3.cpp +++ b/krec/mp3_export/krecexport_mp3.cpp @@ -128,7 +128,7 @@ bool KRecExport_MP3::process() { i18n( lame_error[ code ] ) ); error_occurred = true; } - TQTimer::singleShot( 10, this, TQT_SLOT( process() ) ); + TQTimer::singleShot( 10, this, TQ_SLOT( process() ) ); } return true; } else return false; diff --git a/krec/ogg_export/krecexport_ogg.cpp b/krec/ogg_export/krecexport_ogg.cpp index 2841c64b..5c957577 100644 --- a/krec/ogg_export/krecexport_ogg.cpp +++ b/krec/ogg_export/krecexport_ogg.cpp @@ -169,7 +169,7 @@ bool KRecExport_OGG::process() { } } } - TQTimer::singleShot( 10, this, TQT_SLOT( process() ) ); + TQTimer::singleShot( 10, this, TQ_SLOT( process() ) ); } return true; } else return false; diff --git a/kscd/Makefile.am b/kscd/Makefile.am index c7091a6d..93297cb5 100644 --- a/kscd/Makefile.am +++ b/kscd/Makefile.am @@ -65,7 +65,6 @@ plat_hpux.c:config.h plat_irix.c:config.h plat_linux.c:config.h plat_news.c:config.h -plat_osf1.c:config.h plat_scor5.c:config.h plat_sun.c:config.h plat_sun_audio.c:config.h diff --git a/kscd/bwlednum.cpp b/kscd/bwlednum.cpp index eb18917e..322cf38a 100644 --- a/kscd/bwlednum.cpp +++ b/kscd/bwlednum.cpp @@ -41,7 +41,7 @@ BW_LED_Number::BW_LED_Number( TQWidget *parent, const char *name ) offcolor = TQColor(100,0,0); - showOffColon(FALSE); + showOffColon(false); smallLED = false; current_symbol = ' '; old_segments = &segs[13][0]; // nothing @@ -131,7 +131,7 @@ static char *getSegments( char s) void BW_LED_Number::drawContents( TQPainter *p ){ - drawSymbol( p, current_symbol,TRUE ); + drawSymbol( p, current_symbol,true ); } @@ -155,7 +155,7 @@ void BW_LED_Number::display(char s){ current_symbol = s; current_segments = getSegments(s); - drawSymbol(&p,s,FALSE); + drawSymbol(&p,s,false); p.end(); @@ -202,12 +202,12 @@ void BW_LED_Number::drawSymbol( TQPainter *p,char ,bool repaint ){ // by default not shown. for(int l = 0; l <= NUM_OF_SEGMENTS +1; l++){ - drawSegment(pos,(char) l,*p,Segment_Length,TRUE); //erase segment + drawSegment(pos,(char) l,*p,Segment_Length,true); //erase segment } } else{ for(int l = 0; l <= NUM_OF_SEGMENTS -1; l++){ - drawSegment(pos,(char) l,*p,Segment_Length,TRUE); //erase segment + drawSegment(pos,(char) l,*p,Segment_Length,true); //erase segment } } @@ -215,7 +215,7 @@ void BW_LED_Number::drawSymbol( TQPainter *p,char ,bool repaint ){ for(int l = 0; l <= NUM_OF_SEGMENTS -1; l++){ if(current_segments[l] != STOP_CHAR){ - drawSegment(pos,current_segments[l],*p,Segment_Length,FALSE); // draw segment + drawSegment(pos,current_segments[l],*p,Segment_Length,false); // draw segment } else{ break; @@ -229,7 +229,7 @@ void BW_LED_Number::drawSymbol( TQPainter *p,char ,bool repaint ){ if(current_segments[l] != STOP_CHAR){ if(!seg_contained_in(current_segments[l],old_segments)) - drawSegment(pos,current_segments[l],*p,Segment_Length,FALSE); // draw segment + drawSegment(pos,current_segments[l],*p,Segment_Length,false); // draw segment } else{ break; @@ -241,7 +241,7 @@ void BW_LED_Number::drawSymbol( TQPainter *p,char ,bool repaint ){ if(old_segments[k] != STOP_CHAR){ if(!seg_contained_in(old_segments[k],current_segments)) - drawSegment(pos,old_segments[k],*p,Segment_Length,TRUE); //erase segment + drawSegment(pos,old_segments[k],*p,Segment_Length,true); //erase segment } else{ break; @@ -254,12 +254,12 @@ void BW_LED_Number::drawSymbol( TQPainter *p,char ,bool repaint ){ bool BW_LED_Number::seg_contained_in( char c, char* seg){ - bool result = FALSE; + bool result = false; while ( *seg != STOP_CHAR){ // printf("Comparing %d with %d\n",c,*seg); if ( c == *seg ) - result = TRUE; + result = true; seg++; } diff --git a/kscd/bwlednum.h b/kscd/bwlednum.h index 194c5823..79497a18 100644 --- a/kscd/bwlednum.h +++ b/kscd/bwlednum.h @@ -28,7 +28,7 @@ public: ~BW_LED_Number(); void setSmallLED(bool ); // if you LED is small it might look better - // if you call setSmallLED(TRUE) + // if you call setSmallLED(true) // this sets the fore and background color of the LED // the forground defaults to yellow, the background defaults @@ -42,7 +42,7 @@ public: void setLEDoffColor(TQColor color); - // calling showOffColon(TRUE) will show the colon if not illuminated + // calling showOffColon(true) will show the colon if not illuminated // this is rather ugly -- the default is that they are not shown. void showOffColon(bool off); @@ -67,7 +67,7 @@ protected: private: bool seg_contained_in( char c, char* seg); - void drawSegment( const TQPoint &, char, TQPainter &, int, bool = FALSE ); + void drawSegment( const TQPoint &, char, TQPainter &, int, bool = false ); void drawSymbol( TQPainter *p,char s ,bool repaint); char* old_segments; diff --git a/kscd/cddbdlg.cpp b/kscd/cddbdlg.cpp index 40a17cbf..9fc6cbac 100644 --- a/kscd/cddbdlg.cpp +++ b/kscd/cddbdlg.cpp @@ -46,15 +46,15 @@ CDDBDlg::CDDBDlg( TQWidget* parent, const char* name ) setButtonText( User1, i18n( "Upload" ) ); setButtonText( User2, i18n( "Fetch Info" ) ); - connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( save() ) ); - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( upload() ) ); - connect( this, TQT_SIGNAL( user2Clicked() ), TQT_SIGNAL( cddbQuery() ) ); - connect( m_dlgBase, TQT_SIGNAL( play( int ) ), TQT_SIGNAL( play( int ) ) ); + connect( this, TQ_SIGNAL( okClicked() ), TQ_SLOT( save() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( upload() ) ); + connect( this, TQ_SIGNAL( user2Clicked() ), TQ_SIGNAL( cddbQuery() ) ); + connect( m_dlgBase, TQ_SIGNAL( play( int ) ), TQ_SIGNAL( play( int ) ) ); cddbClient = new KCDDB::Client(); cddbClient->setBlockingMode(false); - connect (cddbClient, TQT_SIGNAL(finished(CDDB::Result)), - TQT_SLOT(submitFinished(CDDB::Result))); + connect (cddbClient, TQ_SIGNAL(finished(CDDB::Result)), + TQ_SLOT(submitFinished(CDDB::Result))); } diff --git a/kscd/configWidget.cpp b/kscd/configWidget.cpp index 3cde9992..696e95f8 100644 --- a/kscd/configWidget.cpp +++ b/kscd/configWidget.cpp @@ -63,7 +63,7 @@ public: * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. + * true to construct a modal dialog. */ configWidget::configWidget(KSCD* player, TQWidget* parent, const char* name) : configWidgetUI(parent, name), diff --git a/kscd/configWidgetUI.ui b/kscd/configWidgetUI.ui index 79c06938..14f4435b 100644 --- a/kscd/configWidgetUI.ui +++ b/kscd/configWidgetUI.ui @@ -445,10 +445,10 @@ <tabstop>kcfg_DigitalPlayback</tabstop> <tabstop>kcfg_AudioDevice</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>kcfg_DigitalPlayback_toggled( bool )</slot> <slot>kcfg_SelectEncoding_toggled(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcolorbutton.h</include> diff --git a/kscd/docking.cpp b/kscd/docking.cpp index 0241b803..cce4652f 100644 --- a/kscd/docking.cpp +++ b/kscd/docking.cpp @@ -53,13 +53,13 @@ DockWidget::DockWidget( KSCD* parent, const char *name) // popup menu for right mouse button TQPopupMenu* popup = contextMenu(); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-playback-start", TDEIcon::Small), i18n("Play/Pause"), parent, TQT_SLOT(playClicked())); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-playback-stop", TDEIcon::Small), i18n("Stop"), parent, TQT_SLOT(stopClicked())); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-skip-forward", TDEIcon::Small), i18n("Next"), parent, TQT_SLOT(nextClicked())); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-skip-backward", TDEIcon::Small), i18n("Previous"), parent, TQT_SLOT(prevClicked())); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_eject", TDEIcon::Small), i18n("Eject"), parent, TQT_SLOT(ejectClicked())); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-playback-start", TDEIcon::Small), i18n("Play/Pause"), parent, TQ_SLOT(playClicked())); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-playback-stop", TDEIcon::Small), i18n("Stop"), parent, TQ_SLOT(stopClicked())); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-skip-forward", TDEIcon::Small), i18n("Next"), parent, TQ_SLOT(nextClicked())); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-skip-backward", TDEIcon::Small), i18n("Previous"), parent, TQ_SLOT(prevClicked())); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_eject", TDEIcon::Small), i18n("Eject"), parent, TQ_SLOT(ejectClicked())); - TQToolTip::add(this, kapp->aboutData()->programName()); + TQToolTip::add(this, tdeApp->aboutData()->programName()); } DockWidget::~DockWidget() @@ -80,7 +80,7 @@ void DockWidget::createPopup(const TQString &songName, bool addButtons) { TQPushButton* backButton = new TQPushButton(m_backPix, 0, box, "popup_back"); backButton->setFlat(true); - connect(backButton, TQT_SIGNAL(clicked()), m_backAction, TQT_SLOT(activate())); + connect(backButton, TQ_SIGNAL(clicked()), m_backAction, TQ_SLOT(activate())); } TQLabel* l = new TQLabel(songName, box); @@ -90,7 +90,7 @@ void DockWidget::createPopup(const TQString &songName, bool addButtons) { TQPushButton* forwardButton = new TQPushButton(m_forwardPix, 0, box, "popup_forward"); forwardButton->setFlat(true); - connect(forwardButton, TQT_SIGNAL(clicked()), m_forwardAction, TQT_SLOT(activate())); + connect(forwardButton, TQ_SIGNAL(clicked()), m_forwardAction, TQ_SLOT(activate())); } m_popup->setView(box); @@ -110,7 +110,7 @@ void DockWidget::setToolTip(const TQString& text) if (text.isEmpty()) { - TQToolTip::add(this, kapp->aboutData()->programName()); + TQToolTip::add(this, tdeApp->aboutData()->programName()); } else { diff --git a/kscd/kcompactdisc.cpp b/kscd/kcompactdisc.cpp index e17fdaa7..045d0ea4 100644 --- a/kscd/kcompactdisc.cpp +++ b/kscd/kcompactdisc.cpp @@ -53,7 +53,7 @@ #define KSCDMAGIC 0 #endif -#include <kprocess.h> +#include <tdeprocess.h> #include <config.h> extern "C" @@ -109,7 +109,7 @@ TDECompactDisc::TDECompactDisc(InformationMode infoMode) : m_trackArtists.clear(); m_trackTitles.clear(); m_trackStartFrames.clear(); - connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timerExpired())); + connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(timerExpired())); } TDECompactDisc::~TDECompactDisc() diff --git a/kscd/kscd-script b/kscd/kscd-script index 89146f7c..27de2d26 100755 --- a/kscd/kscd-script +++ b/kscd/kscd-script @@ -51,7 +51,6 @@ echo " Sun ........................ S" echo " HPUX ....................... H" echo " Irix ....................... I" echo " Sony NEWS .................. N" -echo " OSF/1 ...................... O" echo " Ultrix ..................... U" echo " Generic SVR4 (not Sun) ..... V" echo @@ -661,36 +660,6 @@ echo "#endif /* ultrix */" >> $config_file } -osf_conf(){ - -clear -echo "KSCD configuration for OSF systems" -echo "----------------------------------" -echo - -give_instructions -write_config_header - -echo "" >> config_file -echo "#if defined(__osf__)" >> $config_file - -echo "Nothing to be done for OSF. The CD device should be automatically detected." -echo "If you have trouble look at plat_osf1.c and let me know what needs to be" -echo "changed." - -echo "" -echo $ac_n "Press [Enter] to continue.$ac_c" -read dummy - -echo "" >> $config_file -echo "#endif /* osf */" >> $config_file -echo "" >> $config_file - -#endif - - -} - generic_svr_conf(){ clear @@ -751,7 +720,6 @@ s|S) sun_conf;; h|H) hp_conf;; i|I) irix_conf;; n|N) sony_conf;; -o|O) osf_conf;; u|U) ultrix_conf;; v|V) generic_svr_conf;; *) linux_conf;; diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp index df4eeabf..1c1c2c0c 100644 --- a/kscd/kscd.cpp +++ b/kscd/kscd.cpp @@ -54,11 +54,11 @@ #include <tdepopupmenu.h> #include <tdeprotocolmanager.h> #include <krun.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdaction.h> #include <kstringhandler.h> #include <kurl.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <tdeglobalsettings.h> #include <tdecmoduleloader.h> #include <tdeconfigdialog.h> @@ -103,7 +103,7 @@ KSCD::KSCD( TQWidget *parent, const char *name ) random_current = random_list.begin(); cddb = new KCDDB::Client(); - connect(cddb, TQT_SIGNAL(finished(CDDB::Result)), TQT_TQOBJECT(this), TQT_SLOT(lookupCDDBDone(CDDB::Result))); + connect(cddb, TQ_SIGNAL(finished(CDDB::Result)), this, TQ_SLOT(lookupCDDBDone(CDDB::Result))); #if defined(BUILD_CDDA) audio_systems_list @@ -124,10 +124,10 @@ KSCD::KSCD( TQWidget *parent, const char *name ) // the time slider timeIcon->setPixmap(SmallIcon("player_time")); - connect(timeSlider, TQT_SIGNAL(sliderPressed()), TQT_SLOT(timeSliderPressed())); - connect(timeSlider, TQT_SIGNAL(sliderReleased()), TQT_SLOT(timeSliderReleased())); - connect(timeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(timeSliderMoved(int))); - connect(timeSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(jumpToTime(int))); + connect(timeSlider, TQ_SIGNAL(sliderPressed()), TQ_SLOT(timeSliderPressed())); + connect(timeSlider, TQ_SIGNAL(sliderReleased()), TQ_SLOT(timeSliderReleased())); + connect(timeSlider, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(timeSliderMoved(int))); + connect(timeSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(jumpToTime(int))); // the volume slider volumeIcon->setPixmap(SmallIcon("player_volume")); @@ -135,33 +135,33 @@ KSCD::KSCD( TQWidget *parent, const char *name ) TQString str; str = TQString::fromUtf8( TQCString().sprintf(i18n("Vol: %02d%%").utf8(), Prefs::volume()) ); volumelabel->setText(str); - connect(volumeSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(volChanged(int))); + connect(volumeSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(volChanged(int))); /* FIXME check for return value */ setDevicePaths(/*Prefs::cdDevice(), Prefs::audioSystem(), Prefs::audioDevice()*/); - connect(m_cd, TQT_SIGNAL(trackPlaying(unsigned, unsigned)), TQT_TQOBJECT(this), TQT_SLOT(trackUpdate(unsigned, unsigned))); - connect(m_cd, TQT_SIGNAL(trackPaused(unsigned, unsigned)), TQT_TQOBJECT(this), TQT_SLOT(trackUpdate(unsigned, unsigned))); - connect(m_cd, TQT_SIGNAL(trackChanged(unsigned, unsigned)), TQT_TQOBJECT(this), TQT_SLOT(trackChanged(unsigned, unsigned))); - connect(m_cd, TQT_SIGNAL(discStopped()), TQT_TQOBJECT(this), TQT_SLOT(discStopped())); - connect(m_cd, TQT_SIGNAL(discChanged(unsigned)), TQT_TQOBJECT(this), TQT_SLOT(discChanged(unsigned))); - connect( &queryledtimer, TQT_SIGNAL(timeout()), TQT_SLOT(togglequeryled()) ); - connect( &titlelabeltimer, TQT_SIGNAL(timeout()), TQT_SLOT(titlelabeltimeout()) ); - connect( &cycletimer, TQT_SIGNAL(timeout()), TQT_SLOT(cycletimeout()) ); - connect( &jumpTrackTimer, TQT_SIGNAL(timeout()), TQT_SLOT(jumpTracks()) ); + connect(m_cd, TQ_SIGNAL(trackPlaying(unsigned, unsigned)), this, TQ_SLOT(trackUpdate(unsigned, unsigned))); + connect(m_cd, TQ_SIGNAL(trackPaused(unsigned, unsigned)), this, TQ_SLOT(trackUpdate(unsigned, unsigned))); + connect(m_cd, TQ_SIGNAL(trackChanged(unsigned, unsigned)), this, TQ_SLOT(trackChanged(unsigned, unsigned))); + connect(m_cd, TQ_SIGNAL(discStopped()), this, TQ_SLOT(discStopped())); + connect(m_cd, TQ_SIGNAL(discChanged(unsigned)), this, TQ_SLOT(discChanged(unsigned))); + connect( &queryledtimer, TQ_SIGNAL(timeout()), TQ_SLOT(togglequeryled()) ); + connect( &titlelabeltimer, TQ_SIGNAL(timeout()), TQ_SLOT(titlelabeltimeout()) ); + connect( &cycletimer, TQ_SIGNAL(timeout()), TQ_SLOT(cycletimeout()) ); + connect( &jumpTrackTimer, TQ_SIGNAL(timeout()), TQ_SLOT(jumpTracks()) ); /* these are always connected in base class - connect( playPB, TQT_SIGNAL(clicked()), TQT_SLOT(playClicked()) ); - connect( nextPB, TQT_SIGNAL(clicked()), TQT_SLOT(nextClicked()) ); - connect( prevPB, TQT_SIGNAL(clicked()), TQT_SLOT(prevClicked()) ); - connect( stopPB, TQT_SIGNAL(clicked()), TQT_SLOT(stopClicked()) ); - connect( ejectPB, TQT_SIGNAL(clicked()), TQT_SLOT(ejectClicked()) ); + connect( playPB, TQ_SIGNAL(clicked()), TQ_SLOT(playClicked()) ); + connect( nextPB, TQ_SIGNAL(clicked()), TQ_SLOT(nextClicked()) ); + connect( prevPB, TQ_SIGNAL(clicked()), TQ_SLOT(prevClicked()) ); + connect( stopPB, TQ_SIGNAL(clicked()), TQ_SLOT(stopClicked()) ); + connect( ejectPB, TQ_SIGNAL(clicked()), TQ_SLOT(ejectClicked()) ); */ - connect( repeatPB, TQT_SIGNAL(clicked()), TQT_SLOT(loopClicked()) ); - connect( songListCB, TQT_SIGNAL(activated(int)), TQT_SLOT(trackSelected(int))); - connect( shufflePB, TQT_SIGNAL(clicked()), TQT_SLOT(randomSelected())); - connect( cddbPB, TQT_SIGNAL(clicked()), TQT_SLOT(CDDialogSelected())); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_TQOBJECT(this), TQT_SLOT(setColors())); - connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(setIcons())); + connect( repeatPB, TQ_SIGNAL(clicked()), TQ_SLOT(loopClicked()) ); + connect( songListCB, TQ_SIGNAL(activated(int)), TQ_SLOT(trackSelected(int))); + connect( shufflePB, TQ_SIGNAL(clicked()), TQ_SLOT(randomSelected())); + connect( cddbPB, TQ_SIGNAL(clicked()), TQ_SLOT(CDDialogSelected())); + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(setColors())); + connect(tdeApp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(setIcons())); TQToolTip::remove(songListCB); TQToolTip::add(songListCB, i18n("Track list")); @@ -170,30 +170,30 @@ KSCD::KSCD( TQWidget *parent, const char *name ) m_actions = new TDEActionCollection(this); TDEAction* action; - action = new TDEAction(i18n("Play/Pause"), Key_P, TQT_TQOBJECT(this), TQT_SLOT(playClicked()), m_actions, "Play/Pause"); - action = new TDEAction(i18n("Stop"), Key_S, TQT_TQOBJECT(this), TQT_SLOT(stopClicked()), m_actions, "Stop"); - action = new TDEAction(i18n("Previous"), Key_B, TQT_TQOBJECT(this), TQT_SLOT(prevClicked()), m_actions, "Previous"); - action = new TDEAction(i18n("Next"), Key_N, TQT_TQOBJECT(this), TQT_SLOT(nextClicked()), m_actions, "Next"); - action = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quitClicked()), m_actions); - action = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureKeys()), m_actions, "options_configure_shortcuts"); - action = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureGlobalKeys()), m_actions, "options_configure_globals"); - action = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showConfig()), m_actions); - action = new TDEAction(i18n("Loop"), Key_L, TQT_TQOBJECT(this), TQT_SLOT(loopClicked()), m_actions, "Loop"); - action = new TDEAction(i18n("Eject"), CTRL + Key_E, TQT_TQOBJECT(this), TQT_SLOT(ejectClicked()), m_actions, "Eject"); - action = new TDEAction(i18n("Increase Volume"), Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(incVolume()), m_actions, "IncVolume"); + action = new TDEAction(i18n("Play/Pause"), Key_P, this, TQ_SLOT(playClicked()), m_actions, "Play/Pause"); + action = new TDEAction(i18n("Stop"), Key_S, this, TQ_SLOT(stopClicked()), m_actions, "Stop"); + action = new TDEAction(i18n("Previous"), Key_B, this, TQ_SLOT(prevClicked()), m_actions, "Previous"); + action = new TDEAction(i18n("Next"), Key_N, this, TQ_SLOT(nextClicked()), m_actions, "Next"); + action = KStdAction::quit(this, TQ_SLOT(quitClicked()), m_actions); + action = KStdAction::keyBindings(this, TQ_SLOT(configureKeys()), m_actions, "options_configure_shortcuts"); + action = KStdAction::keyBindings(this, TQ_SLOT(configureGlobalKeys()), m_actions, "options_configure_globals"); + action = KStdAction::preferences(this, TQ_SLOT(showConfig()), m_actions); + action = new TDEAction(i18n("Loop"), Key_L, this, TQ_SLOT(loopClicked()), m_actions, "Loop"); + action = new TDEAction(i18n("Eject"), CTRL + Key_E, this, TQ_SLOT(ejectClicked()), m_actions, "Eject"); + action = new TDEAction(i18n("Increase Volume"), Key_Plus, this, TQ_SLOT(incVolume()), m_actions, "IncVolume"); TDEShortcut increaseVolume = action->shortcut(); increaseVolume.append( KKey( Key_Equal ) ); action->setShortcut( increaseVolume ); - action = new TDEAction(i18n("Decrease Volume"), Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(decVolume()), m_actions, "DecVolume"); - action = new TDEAction(i18n("Options"), CTRL + Key_T, TQT_TQOBJECT(this), TQT_SLOT(showConfig()), m_actions, "Options"); - action = new TDEAction(i18n("Shuffle"), Key_R, TQT_TQOBJECT(this), TQT_SLOT(randomSelected()), m_actions, "Shuffle"); - action = new TDEAction(i18n("CDDB"), CTRL + Key_D, TQT_TQOBJECT(this), TQT_SLOT(CDDialogSelected()), m_actions, "CDDB"); + action = new TDEAction(i18n("Decrease Volume"), Key_Minus, this, TQ_SLOT(decVolume()), m_actions, "DecVolume"); + action = new TDEAction(i18n("Options"), CTRL + Key_T, this, TQ_SLOT(showConfig()), m_actions, "Options"); + action = new TDEAction(i18n("Shuffle"), Key_R, this, TQ_SLOT(randomSelected()), m_actions, "Shuffle"); + action = new TDEAction(i18n("CDDB"), CTRL + Key_D, this, TQ_SLOT(CDDialogSelected()), m_actions, "CDDB"); m_actions->readShortcutSettings("Shortcuts"); m_actions->action( "options_configure_globals" )->setText( i18n( "Configure &Global Shortcuts..." ) ); - kapp->installKDEPropertyMap(); + tdeApp->installKDEPropertyMap(); TQSqlPropertyMap *map = TQSqlPropertyMap::defaultMap(); map->insert("KComboBox", "currentText"); @@ -227,28 +227,28 @@ KSCD::~KSCD() void KSCD::initGlobalShortcuts() { - m_globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this) ); + m_globalAccel = new TDEGlobalAccel( this ); //Definition of global shortcuts is based on 'local' shortcuts which follow //the WIN key. m_globalAccel->insert("Next", i18n("Next"), 0, KKey("WIN+N"), KKey("WIN+Right"), - TQT_TQOBJECT(this), TQT_SLOT(nextClicked())); + this, TQ_SLOT(nextClicked())); //NOTE: WIN+B collidates with amarok's default global shortcut. m_globalAccel->insert("Previous", i18n("Previous"), 0, KKey("WIN+B"), KKey("WIN+Left"), - TQT_TQOBJECT(this), TQT_SLOT(prevClicked())); + this, TQ_SLOT(prevClicked())); m_globalAccel->insert("Play/Pause", i18n("Play/Pause"), 0, KKey("WIN+P"), 0, - TQT_TQOBJECT(this), TQT_SLOT(playClicked())); + this, TQ_SLOT(playClicked())); m_globalAccel->insert("Stop", i18n("Stop"), 0, KKey("WIN+S"), 0, - TQT_TQOBJECT(this), TQT_SLOT(stopClicked())); + this, TQ_SLOT(stopClicked())); m_globalAccel->insert("IncVolume", i18n("Increase Volume"), 0, KKey("WIN+Plus"), KKey("WIN+Up"), - TQT_TQOBJECT(this), TQT_SLOT(incVolume())); + this, TQ_SLOT(incVolume())); m_globalAccel->insert("DecVolume", i18n("Decrease Volume"), 0, KKey("WIN+Minus"), KKey("WIN+Down"), - TQT_TQOBJECT(this), TQT_SLOT(decVolume())); + this, TQ_SLOT(decVolume())); m_globalAccel->insert("Shuffle", i18n("Shuffle"), 0, KKey("WIN+R"), 0, - TQT_TQOBJECT(this), TQT_SLOT(incVolume())); + this, TQ_SLOT(incVolume())); m_globalAccel->setConfigGroup( "GlobalShortcuts" ); - m_globalAccel->readSettings( kapp->config() ); + m_globalAccel->readSettings( tdeApp->config() ); m_globalAccel->updateConnections(); } @@ -312,7 +312,7 @@ void KSCD::drawPanel() trackTimeLED[u]->setLEDoffColor(Prefs::backColor()); trackTimeLED[u]->setLEDColor(Prefs::ledColor(), Prefs::backColor()); trackTimeLED[u]->setGeometry(2 + u * 18, D, 23, 30); - connect(trackTimeLED[u], TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(cycleplaytimemode())); + connect(trackTimeLED[u], TQ_SIGNAL(clicked()), this, TQ_SLOT(cycleplaytimemode())); } setLEDs(-1); @@ -369,7 +369,7 @@ void KSCD::setupPopups() mainPopup->insertItem(i18n("Artist Information"), infoPopup); - connect( infoPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(information(int)) ); + connect( infoPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(information(int)) ); KHelpMenu* helpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false); mainPopup->insertItem(SmallIcon("help"),i18n("&Help"), helpMenu->menu()); @@ -382,13 +382,13 @@ void KSCD::playClicked() if (m_cd->discId() == TDECompactDisc::missingDisc) return; - kapp->processEvents(); - kapp->flushX(); + tdeApp->processEvents(); + tdeApp->flushX(); if (!m_cd->isPlaying()) { - kapp->processEvents(); - kapp->flushX(); + tdeApp->processEvents(); + tdeApp->flushX(); if (m_cd->isPaused()) { @@ -427,8 +427,8 @@ void KSCD::playClicked() playPB->setText(i18n("Play")); } - kapp->processEvents(); - kapp->flushX(); + tdeApp->processEvents(); + tdeApp->flushX(); } // playClicked() void KSCD::setShuffle(int shuffle) @@ -462,8 +462,8 @@ void KSCD::stopClicked() { stoppedByUser = true; - kapp->processEvents(); - kapp->flushX(); + tdeApp->processEvents(); + tdeApp->flushX(); m_cd->stop(); } // stopClicked() @@ -488,8 +488,8 @@ void KSCD::prevClicked() } } - kapp->processEvents(); - kapp->flushX(); + tdeApp->processEvents(); + tdeApp->flushX(); m_cd->play(track, 0, playlist.isEmpty() ? 0 : track); } // prevClicked() @@ -516,8 +516,8 @@ bool KSCD::nextClicked() } } - kapp->processEvents(); - kapp->flushX(); + tdeApp->processEvents(); + tdeApp->flushX(); m_cd->play(track, 0, Prefs::randomPlay() || !playlist.isEmpty() ? track + 1 : 0); return true; } // nextClicked() @@ -570,8 +570,8 @@ void KSCD::trackChanged(unsigned track, unsigned trackLength) void KSCD::jumpToTime(int ms, bool forcePlay) { - kapp->processEvents(); - kapp->flushX(); + tdeApp->processEvents(); + tdeApp->flushX(); int track = m_cd->track(); if ((m_cd->isPlaying() || forcePlay) && @@ -617,15 +617,15 @@ void KSCD::quitClicked() setLEDs(-1); // Good GOD this is evil - kapp->processEvents(); - kapp->flushX(); + tdeApp->processEvents(); + tdeApp->flushX(); if(Prefs::stopExit()) m_cd->stop(); delete m_cd; - kapp->quit(); + tdeApp->quit(); } // quitClicked() bool KSCD::event( TQEvent *e ) @@ -639,8 +639,8 @@ void KSCD::loopOn() Prefs::setLooping(true); loopled->on(); loopled->show(); - kapp->processEvents(); - kapp->flushX(); + tdeApp->processEvents(); + tdeApp->flushX(); } // loopOn; void KSCD::loopOff() @@ -648,8 +648,8 @@ void KSCD::loopOff() Prefs::setLooping(false); loopled->off(); loopled->show(); - kapp->processEvents(); - kapp->flushX(); + tdeApp->processEvents(); + tdeApp->flushX(); } // loopOff; void KSCD::loopClicked() @@ -675,7 +675,7 @@ void KSCD::ejectClicked() void KSCD::closeEvent(TQCloseEvent *e) { - if (Prefs::docking() && !kapp->sessionSaving()) + if (Prefs::docking() && !tdeApp->sessionSaving()) { hide(); e->ignore(); @@ -756,16 +756,16 @@ void KSCD::showConfig() cfg->readConfig(); configDialog -> addPage(m, cfg, TQString("CDDB"), "application-x-cda", i18n("Configure Fetching Items")); - connect(configDialog, TQT_SIGNAL(okClicked()), m, TQT_SLOT(save())); - connect(configDialog, TQT_SIGNAL(applyClicked()), m, TQT_SLOT(save())); - connect(configDialog, TQT_SIGNAL(defaultClicked()), m, TQT_SLOT(defaults())); + connect(configDialog, TQ_SIGNAL(okClicked()), m, TQ_SLOT(save())); + connect(configDialog, TQ_SIGNAL(applyClicked()), m, TQ_SLOT(save())); + connect(configDialog, TQ_SIGNAL(defaultClicked()), m, TQ_SLOT(defaults())); } } } updateConfigDialog(confWidget); - connect(configDialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(configDone())); + connect(configDialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(configDone())); configDialog -> show(); } // showConfig() @@ -814,14 +814,14 @@ void KSCD::setDocking(bool dock) if (!m_dockWidget) { m_dockWidget = new DockWidget(this, "dockw"); - connect(m_dockWidget, TQT_SIGNAL(quitSelected()), TQT_TQOBJECT(this), TQT_SLOT(quitClicked())); + connect(m_dockWidget, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(quitClicked())); } m_dockWidget->show(); - connect(this, TQT_SIGNAL(trackChanged(const TQString&)), - m_dockWidget, TQT_SLOT(setToolTip(const TQString&))); - connect(this, TQT_SIGNAL(trackChanged(const TQString&)), - m_dockWidget, TQT_SLOT(createPopup(const TQString&))); + connect(this, TQ_SIGNAL(trackChanged(const TQString&)), + m_dockWidget, TQ_SLOT(setToolTip(const TQString&))); + connect(this, TQ_SIGNAL(trackChanged(const TQString&)), + m_dockWidget, TQ_SLOT(createPopup(const TQString&))); } else { @@ -1155,11 +1155,11 @@ void KSCD::CDDialogSelected() cddialog = new CDDBDlg(this); cddialog->setData(cddbInfo, m_cd->discSignature(), playlist); - connect(cddialog,TQT_SIGNAL(cddbQuery()),TQT_SLOT(lookupCDDB())); - connect(cddialog,TQT_SIGNAL(newCDInfoStored(KCDDB::CDInfo)), - TQT_SLOT(setCDInfo(KCDDB::CDInfo))); - connect(cddialog,TQT_SIGNAL(finished()),TQT_SLOT(CDDialogDone())); - connect(cddialog,TQT_SIGNAL(play(int)),TQT_SLOT(trackSelected(int))); + connect(cddialog,TQ_SIGNAL(cddbQuery()),TQ_SLOT(lookupCDDB())); + connect(cddialog,TQ_SIGNAL(newCDInfoStored(KCDDB::CDInfo)), + TQ_SLOT(setCDInfo(KCDDB::CDInfo))); + connect(cddialog,TQ_SIGNAL(finished()),TQ_SLOT(CDDialogDone())); + connect(cddialog,TQ_SIGNAL(play(int)),TQ_SLOT(trackSelected(int))); } cddialog->show(); @@ -1274,8 +1274,8 @@ void KSCD::led_on() queryledtimer.start(800); queryled->off(); queryled->show(); - kapp->processEvents(); - kapp->flushX(); + tdeApp->processEvents(); + tdeApp->flushX(); } // led_on void KSCD::togglequeryled() @@ -1491,7 +1491,7 @@ void KSCD::information(int i) bool KSCD::saveState(TQSessionManager& /*sm*/) { writeSettings(); - TDEConfig* config = TDEApplication::kApplication()->sessionConfig(); + TDEConfig* config = tdeApp->sessionConfig(); config->setGroup("General"); config->writeEntry("Show", isVisible()); return true; @@ -1508,7 +1508,7 @@ void KSCD::keyPressEvent(TQKeyEvent* e) if (e->key() == TQt::Key_F1) { - kapp->invokeHelp(); + tdeApp->invokeHelp(); } else if (isNum) { @@ -1620,10 +1620,10 @@ int main( int argc, char *argv[] ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions(options); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); - if (!KUniqueApplication::start()) + if (!TDEUniqueApplication::start()) { fprintf(stderr, "kscd is already running\n"); if (args->count()>0 || args->isSet("start")) @@ -1646,9 +1646,9 @@ int main( int argc, char *argv[] ) exit(0); } - KUniqueApplication a; + TDEUniqueApplication a; - kapp->dcopClient()->setDefaultObject("CDPlayer"); + tdeApp->dcopClient()->setDefaultObject("CDPlayer"); KSCD *k = new KSCD(); @@ -1657,9 +1657,9 @@ int main( int argc, char *argv[] ) k->setCaption(a.caption()); - if (kapp->isRestored()) + if (tdeApp->isRestored()) { - TDEConfig* config = TDEApplication::kApplication()->sessionConfig(); + TDEConfig* config = tdeApp->sessionConfig(); config->setGroup("General"); if (config->readBoolEntry("Show")) k->show(); diff --git a/kscd/kscd.h b/kscd/kscd.h index 376a436b..b8730280 100644 --- a/kscd/kscd.h +++ b/kscd/kscd.h @@ -54,10 +54,10 @@ class TDECompactDisc; #include "configWidget.h" #include <tdeapplication.h> #include <tdeconfigdialog.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <krandomsequence.h> #include <dcopobject.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> class CDDBDlg; class DockWidget; diff --git a/kscd/kscdmagic/main.cpp b/kscd/kscdmagic/main.cpp index 312b4b14..f0ae7df8 100644 --- a/kscd/kscdmagic/main.cpp +++ b/kscd/kscdmagic/main.cpp @@ -37,7 +37,7 @@ #include <stdio.h> #include <errno.h> -#if defined(__linux__) || defined(__svr4__) || defined(__osf__) +#if defined(__linux__) || defined(__svr4__) #include <signal.h> #include <time.h> diff --git a/kscd/kscdmagic/syna.h b/kscd/kscdmagic/syna.h index d359a8c2..98725dd8 100644 --- a/kscd/kscdmagic/syna.h +++ b/kscd/kscdmagic/syna.h @@ -28,7 +28,7 @@ #define __SYNA_H__ -#if defined(__linux__) || defined(__svr4__) || defined(__osf__) +#if defined(__linux__) || defined(__svr4__) void error(const char *str, bool syscall=false); //Display error and exit void warning(const char *str, bool syscall=false); //Display error @@ -64,11 +64,7 @@ typedef short sampleType; #endif #endif -#ifdef __osf__ -#include <machine/endian.h> -#else #include <endian.h> -#endif #if BYTE_ORDER == BIG_ENDIAN #define BIGENDIAN #else diff --git a/kscd/kscdmagic/xlibwrap.cpp b/kscd/kscdmagic/xlibwrap.cpp index e0ff74ba..b893ea84 100644 --- a/kscd/kscdmagic/xlibwrap.cpp +++ b/kscd/kscdmagic/xlibwrap.cpp @@ -21,7 +21,7 @@ 27 Bond St., Mt. Waverley, 3149, Melbourne, Australia */ -#if defined(__linux__) || defined (__svr4__) || defined(__osf__) +#if defined(__linux__) || defined (__svr4__) #include <string.h> diff --git a/kscd/libwm/CMakeLists.txt b/kscd/libwm/CMakeLists.txt index 4613f544..ae7832b0 100644 --- a/kscd/libwm/CMakeLists.txt +++ b/kscd/libwm/CMakeLists.txt @@ -29,10 +29,10 @@ tde_add_library( workman STATIC_PIC database.c index.c scsi.c cdda.c plat_linux_cdda.c plat_sun_cdda.c plat_aix.c plat_bsd386.c plat_freebsd.c plat_hpux.c plat_irix.c plat_linux.c plat_netbsd.c plat_svr4.c plat_ultrix.c plat_news.c - plat_openbsd.c plat_osf1.c plat_sun.c plat_scor5.c + plat_openbsd.c plat_sun.c plat_scor5.c drv_sony.c drv_toshiba.c EMBED workmanaudio-static LINK - ${ALSA_LIBRARIES} pthread + ${ALSA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/kscd/libwm/ConfigureChecks.cmake b/kscd/libwm/ConfigureChecks.cmake index 31ce9815..b6a12244 100644 --- a/kscd/libwm/ConfigureChecks.cmake +++ b/kscd/libwm/ConfigureChecks.cmake @@ -28,6 +28,7 @@ if( WITH_KSCD_CDDA AND NOT BUILD_CDDA ) #include <linux/cdrom.h> #undef asm #undef inline +#include <sys/ioctl.h> int main() { #if defined(__linux__) diff --git a/kscd/libwm/Makefile.am b/kscd/libwm/Makefile.am index ae2a9144..b46b371a 100644 --- a/kscd/libwm/Makefile.am +++ b/kscd/libwm/Makefile.am @@ -16,7 +16,7 @@ libworkman_la_SOURCES = cddb.c cdinfo.c cdrom.c wm_helpers.c cdtext.c\ database.c index.c scsi.c cdda.c plat_linux_cdda.c plat_sun_cdda.c\ plat_aix.c plat_bsd386.c plat_freebsd.c plat_hpux.c plat_irix.c \ plat_linux.c plat_svr4.c plat_ultrix.c plat_news.c plat_openbsd.c \ -plat_osf1.c plat_sun.c plat_scor5.c \ +plat_sun.c plat_scor5.c \ drv_sony.c drv_toshiba.c #libworkmanincludedir = $(includedir)/libwm diff --git a/kscd/libwm/PLAT_IMPL_STATUS b/kscd/libwm/PLAT_IMPL_STATUS index d1919728..93ac8c5c 100644 --- a/kscd/libwm/PLAT_IMPL_STATUS +++ b/kscd/libwm/PLAT_IMPL_STATUS @@ -8,41 +8,41 @@ X function available \ function dummy, null implementation or commented out (X) function available in special configurations -function |aix |bsd386|freebsd|hpux |irix |linux|news |openbsd|osf1 |scor5|sun |svr4 |ultrix| -------------------------+-----+------+-------+-----+-----+-----+-----+-------+-----+-----+-----+-----+------+ -find_cdrom() | - | - | - | - | - | - | - | - | X | - | X | X | X | -gen_init() | \ | \ | \ | \ | (X) | \ | \ | \ | \ | \ | X | \ | \ | -wmcd_open() | X | X | X | X | X | X | X | X | X | X | X | X | X | -wmcd_close() | - | - | - | - | - | - | X | - | - | - | - | - | - | -wmcd_reopen() | X | X | X | X | X | X | X | X | X | X | X | X | X | -wm_scsi() | \ | \ | \ | X | \ | X | \ | \ | \ | X | X | X | \ | -keep_cd_open() | - | - | - | - | - | \ | - | - | - | \ | - | - | - | -gen_get_drive_status() | X | X | X | X | X | X | X | X | X | X | X | X | X | -------------------------+-----+------+-------+-----+-----+-----+-----+-------+-----+-----+-----+-----+------+ -gen_get_trackcount() | X | X | X | X | X | X | X | X | X | X | X | X | X | -gen_get_trackinfo() | X | X | X | X | X | X | X | X | X | X | X | X | X | -gen_get_cdlen() | X | X | X | X | X | X | X | X | X | X | X | X | X | -------------------------+-----+------+-------+-----+-----+-----+-----+-------+-----+-----+-----+-----+------+ -gen_play() | X | X | X | X | X | X | X | X | X | X | X | X | X | -gen_pause() | X | X | X | X | X | X | X | X | X | X | X | X | X | -gen_resume() | X | X | X | X | X | X | X | X | X | X | X | X | X | -gen_stop() | X | X | X | X | X | X | X | X | X | X | X | X | X | -gen_eject() | X | X | X | X | X | X | X | X | X | X | X | X | X | -gen_closetray() | X | X | X | X | X | X | X | X | X | X | X | X | X | -------------------------+-----+------+-------+-----+-----+-----+-----+-------+-----+-----+-----+-----+------+ -scale_volume() | X | X | X | - | - | X | - | X | X | - | - | - | X | -unscale_volume() | X | X | X | - | - | - | - | X | X | - | - | - | X | -gen_set_volume() | X | X | X | X | X | X | X | X | X | X | X | X | X | -gen_get_volume() | X | X | X | X | X | X | X | X | X | X | X | X | X | -------------------------+-----+------+-------+-----+-----+-----+-----+-------+-----+-----+-----+-----+------+ -cdda_init() | - | - | - | - | - | \ | - | - | - | - | X | - | - | -get_ack() | - | - | - | - | - | \ | - | - | - | - | X | - | - | -cdda_kill() | - | - | - | - | - | \ | - | - | - | - | X | - | - | -gen_set_direction() | - | - | - | - | - | \ | - | - | - | - | X | - | - | -gen_set_speed() | - | - | - | - | - | \ | - | - | - | - | X | - | - | -gen_set_loudness() | - | - | - | - | - | \ | - | - | - | - | X | - | - | -gen_save() | - | - | - | - | - | \ | - | - | - | - | X | - | - | -------------------------+-----+------+-------+-----+-----+-----+-----+-------+-----+-----+-----+-----+------+ +function |aix |bsd386|freebsd|hpux |irix |linux|news |openbsd|sun |svr4 |ultrix| +------------------------+-----+------+-------+-----+-----+-----+-----+-------+-----+-----+------+ +find_cdrom() | - | - | - | - | - | - | - | - | X | X | X | +gen_init() | \ | \ | \ | \ | (X) | \ | \ | \ | \ | \ | \ | +wmcd_open() | X | X | X | X | X | X | X | X | X | X | X | +wmcd_close() | - | - | - | - | - | - | X | - | - | - | - | +wmcd_reopen() | X | X | X | X | X | X | X | X | X | X | X | +wm_scsi() | \ | \ | \ | X | \ | X | \ | \ | \ | X | \ | +keep_cd_open() | - | - | - | - | - | \ | - | - | - | - | - | +gen_get_drive_status() | X | X | X | X | X | X | X | X | X | X | X | +------------------------+-----+------+-------+-----+-----+-----+-----+-------+-----+-----+------+ +gen_get_trackcount() | X | X | X | X | X | X | X | X | X | X | X | +gen_get_trackinfo() | X | X | X | X | X | X | X | X | X | X | X | +gen_get_cdlen() | X | X | X | X | X | X | X | X | X | X | X | +------------------------+-----+------+-------+-----+-----+-----+-----+-------+-----+-----+------+ +gen_play() | X | X | X | X | X | X | X | X | X | X | X | +gen_pause() | X | X | X | X | X | X | X | X | X | X | X | +gen_resume() | X | X | X | X | X | X | X | X | X | X | X | +gen_stop() | X | X | X | X | X | X | X | X | X | X | X | +gen_eject() | X | X | X | X | X | X | X | X | X | X | X | +gen_closetray() | X | X | X | X | X | X | X | X | X | X | X | +------------------------+-----+------+-------+-----+-----+-----+-----+-------+-----+-----+------+ +scale_volume() | X | X | X | - | - | X | - | X | X | - | X | +unscale_volume() | X | X | X | - | - | - | - | X | X | - | X | +gen_set_volume() | X | X | X | X | X | X | X | X | X | X | X | +gen_get_volume() | X | X | X | X | X | X | X | X | X | X | X | +------------------------+-----+------+-------+-----+-----+-----+-----+-------+-----+-----+------+ +cdda_init() | - | - | - | - | - | \ | - | - | - | - | - | +get_ack() | - | - | - | - | - | \ | - | - | - | - | - | +cdda_kill() | - | - | - | - | - | \ | - | - | - | - | - | +gen_set_direction() | - | - | - | - | - | \ | - | - | - | - | - | +gen_set_speed() | - | - | - | - | - | \ | - | - | - | - | - | +gen_set_loudness() | - | - | - | - | - | \ | - | - | - | - | - | +gen_save() | - | - | - | - | - | \ | - | - | - | - | - | +------------------------+-----+------+-------+-----+-----+-----+-----+-------+-----+-----+------+ diff --git a/kscd/libwm/cddb.c b/kscd/libwm/cddb.c index e972ef0d..1d6e7026 100644 --- a/kscd/libwm/cddb.c +++ b/kscd/libwm/cddb.c @@ -41,6 +41,7 @@ #include <sys/time.h> #include <sys/socket.h> #include <netinet/in.h> +#include <arpa/inet.h> #include <netdb.h> #include "include/wm_config.h" @@ -234,7 +235,6 @@ connect_open(void) static struct in_addr defaddr; static char *alist[1]; static char namebuf[128]; - int inet_addr(); defaddr.s_addr = inet_addr(host); if ((int) defaddr.s_addr == -1) diff --git a/kscd/libwm/include/wm_config.h b/kscd/libwm/include/wm_config.h index caf7d17e..a2f2640a 100644 --- a/kscd/libwm/include/wm_config.h +++ b/kscd/libwm/include/wm_config.h @@ -45,7 +45,6 @@ * Linux * News (Sony NewsOS) * OpenBSD - * OSF1 * Sun (SunOS/Solaris, Sparc or x86) * SVR4 * Ultrix @@ -288,22 +287,6 @@ #endif /****************************************************************** - * OSF1 - ****************************************************************** - **** **** *** *** *** ******************************* - *** ** ** ****** ****** ** ******************************* - *** ** **** **** *** ***** ******************************* - *** ** ****** ** **** ****** ******************************* - **** **** *** *** ***** ***************************** - ******************************************************************/ -#if defined(__osf__) || defined(__osf) - -/* not needed here, it's figured out by plat_osf1.c */ -/* #define DEFAULT_CD_DEVICE "/dev/rcdrom/cd0" */ - -#endif - -/****************************************************************** * SunOS/Solaris ****************************************************************** **** *** ** ** *** *************************************** diff --git a/kscd/libwm/include/wm_struct.h b/kscd/libwm/include/wm_struct.h index 71afce07..4369c925 100644 --- a/kscd/libwm/include/wm_struct.h +++ b/kscd/libwm/include/wm_struct.h @@ -104,33 +104,34 @@ struct wm_cdinfo /* The global variable "cd" points to the struct for the CD that's playing. */ extern struct wm_cdinfo *cd; -extern struct wm_playlist *new_playlist(); +extern struct wm_playlist *new_playlist(struct wm_cdinfo*, char*); #define WM_STR_GENVENDOR "Generic" #define WM_STR_GENMODEL "drive" #define WM_STR_GENREV "type" +struct wm_drive; /* * Drive descriptor structure. Used for access to low-level routines. */ struct wm_drive_proto { - int (*gen_init)(); - int (*gen_close)(); - int (*gen_get_trackcount)(); - int (*gen_get_cdlen)(); - int (*gen_get_trackinfo)(); - int (*gen_get_drive_status)(); - int (*gen_get_volume)(); - int (*gen_set_volume)(); - int (*gen_pause)(); - int (*gen_resume)(); - int (*gen_stop)(); - int (*gen_play)(); - int (*gen_eject)(); - int (*gen_closetray)(); - int (*gen_get_cdtext)(); + int (*gen_init)(struct wm_drive*); + int (*gen_close)(struct wm_drive*); + int (*gen_get_trackcount)(struct wm_drive*, int*); + int (*gen_get_cdlen)(struct wm_drive*, int*); + int (*gen_get_trackinfo)(struct wm_drive*, int, int*, int*); + int (*gen_get_drive_status)(struct wm_drive*, int, int*, int*, int*, int*); + int (*gen_get_volume)( struct wm_drive*, int*, int*); + int (*gen_set_volume)( struct wm_drive*, int, int); + int (*gen_pause)(struct wm_drive*); + int (*gen_resume)(struct wm_drive*); + int (*gen_stop)(struct wm_drive*); + int (*gen_play)(struct wm_drive*, int, int, int); + int (*gen_eject)(struct wm_drive*); + int (*gen_closetray)(struct wm_drive*); + int (*gen_get_cdtext)(struct wm_drive*, unsigned char**, int*); }; struct wm_drive diff --git a/kscd/libwm/plat_linux_cdda.c b/kscd/libwm/plat_linux_cdda.c index 22f24a9d..dc634f3f 100644 --- a/kscd/libwm/plat_linux_cdda.c +++ b/kscd/libwm/plat_linux_cdda.c @@ -25,6 +25,7 @@ * Linux CDDA functions. Derived from the SUN module. */ +#include <stdlib.h> #include "include/wm_cdda.h" #if defined(__linux__) && defined(BUILD_CDDA) diff --git a/kscd/libwm/plat_osf1.c b/kscd/libwm/plat_osf1.c deleted file mode 100644 index 2ccfc49c..00000000 --- a/kscd/libwm/plat_osf1.c +++ /dev/null @@ -1,674 +0,0 @@ -/* - * This file is part of WorkMan, the civilized CD player library - * (c) 1991-1997 by Steven Grimm (original author) - * (c) by Dirk Frsterling (current 'author' = maintainer) - * The maintainer can be contacted by his e-mail address: - * milliByte@DeathsDoor.com - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * - * OSF drive control routines. - */ - - -#if defined(__osf__) || defined(__osf) - - -#include <errno.h> -#include <stdio.h> -#include <sys/types.h> -#include <fcntl.h> -#include <sys/param.h> -#include <sys/stat.h> -#include <sys/ststfd.h> -#include <sys/time.h> -#include <string.h> -/* #include <sys/rzdisk.h> -#include <sys/cdrom.h> */ -#include <io/cam/rzdisk.h> -#include <io/cam/cdrom.h> - -#include "include/wm_config.h" -#include "include/wm_struct.h" -#include "include/wm_helpers.h" -#include "include/wm_cdtext.h" - - -#define WM_MSG_CLASS WM_MSG_CLASS_PLATFORM - -/* - * This structure will be filled with the TOC header and all entries. - * Ultrix doesn't seem to allow getting single TOC entries. - * - Chris Ross (cross@eng.umd.edu) - */ -struct cd_toc_header_and_entries -{ - struct cd_toc_header cdth; - struct cd_toc_entry cdte[CDROM_MAX_TRACK+1]; -}; - -void *malloc(); -char *strchr(); - -int min_volume = 128; -int max_volume = 255; -static char* osf_cd_device = NULL; - -/* - * fgetline() - * - * Simulate fgets, but joining continued lines in the output of uerf. - * - * platform specific internal function - * - */ - -#define BUF_SIZE 85 /* Max length of a (real) line */ - -char * -fgetline( FILE *fp ) -{ - static char *retval = NULL; - static char holdbuf[BUF_SIZE + 1]; - char tmp[BUF_SIZE + 1]; - char *stmp; - - if (!retval) - { - retval = malloc(BUF_SIZE * 3); /* 3 lines can be joined */ - if (!retval) - return(NULL); - else - *retval = '\0'; - } - - if (*holdbuf) - { - strcpy(retval, holdbuf); - retval[strlen(retval)-1] = '\0'; - memset(holdbuf, 0, BUF_SIZE+1); - } - - while (fgets(tmp, BUF_SIZE, fp)) - { - stmp = tmp + strspn(tmp, " \t"); - if (*stmp == '_') { /* Continuation line */ - retval[strlen(retval)-1] = '\0'; /* Trim off C/R */ - strcat(retval, stmp+1); - } else { - if (*retval) - { - strcpy(holdbuf, tmp); - holdbuf[strlen(holdbuf)-1] = -1; - return retval; - } else { /* First line read, keep reading */ - strcat(retval, stmp); - retval[strlen(retval)-1] = '\0'; - } - } - } - return NULL; -} /* fgetline() */ - - -/* - * find_cdrom - * - * Determine the name of the CD-ROM device. - * - * Read through the boot records (via a call to uerf) and find the SCSI - * address of the CD-ROM. - */ -const char* -find_cdrom() -{ - char *data; - FILE *uerf; - int fds[2]; - int pid; - extern char *getenv(); - const char *device = NULL; - - pipe(fds); - - device = getenv("CDROM"); - /* - ** the path of the device has to start w/ /dev - ** otherwise we are vulnerable to race conditions - ** Thomas Biege <thomas@suse.de> - */ - if ( device == NULL || - strncmp("/dev/", device, 5) || - strstr(device, "/../") - ) - return NULL; - - if ((pid = fork()) == 0) - { - close(fds[0]); - dup2(fds[1], 1); - execl("/etc/uerf", "uerf", "-R", "-r", "300", (void *)0); - execl("/usr/sbin/uerf", "uerf", "-R", "-r", "300", (void *)0); - return NULL; /* _exit(1); */ - } else if (pid < 0) { - perror("fork"); - return NULL; - } - - close(fds[1]); - uerf = fdopen(fds[0], "r"); - - while (data = fgetline(uerf)) - if (strstr(data, "RRD42")) - { - char *device_p; - - osf_cd_device = (char *)malloc(sizeof("/dev/rrz##c")); - strcpy(osf_cd_device, "/dev/r"); - device_p = strstr(data, "rz"); - device_p[(int)(strchr(device_p, ' ') - device_p)] = '\0'; - strcat(osf_cd_device, device_p); - strcat(osf_cd_device, "c"); - device = osf_cd_device; - break; - } - - fclose(uerf); - - if (device == NULL) - { - fprintf(stderr, - "No cdrom (RRD42) is installed on this system\n"); - return NULL; - } - - kill(pid, 15); - (void)wait((int *)NULL); - return device; -} /* find_cdrom() */ - -/* - * Initialize the drive. A no-op for the generic driver. - */ -int -gen_init( struct wm_drive *d ) -{ - return (0); -} /* gen_init() */ - -/* - * Open the CD device and figure out what kind of drive is attached. - */ -int -wmcd_open( struct wm_drive *d ) -{ - int fd; - static int warned = 0; - - if (d->fd >= 0) /* Device already open? */ - { - wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "wmcd_open(): [device is open (fd=%d)]\n", d->fd); - return (0); - } - - if (d->cd_device == NULL) - d->cd_device = find_cdrom(); - - d->fd = open(d->cd_device, O_RDWR); - if (d->fd < 0) - { - if (errno == EACCES) - { - return -EACCES; - } - else if (errno != EINTR) - { - return (-6); - } - - /* No CD in drive. */ - return (1); - } - - /* Now fill in the relevant parts of the wm_drive structure. */ - find_drive_struct("", "", ""); - d->fd = fd; - - (d->init)(d); - - return (0); -} /* wmcd_open() */ - -/* - * Re-Open the device if it is open. - */ -int -wmcd_reopen( struct wm_drive *d ) -{ - int status; - - do { - wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "wmcd_reopen\n"); - status = gen_close( d ); - wm_susleep( 1000 ); - wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "calling wmcd_open()\n"); - status = wmcd_open( d ); /* open it as usual */ - wm_susleep( 1000 ); - } while ( status != 0 ); - return status; -} /* wmcd_reopen() */ - -/* - * Send an arbitrary SCSI command to a device. - */ -int -wm_scsi(struct wm_drive *d, unsigned char *cdb, int cdblen, - void *retbuf, int retbuflen, int getreply) -{ - /* OSF1 doesn't have a SCSI passthrough interface, does it? */ - return (-1); -} /* wm_scsi() */ - -int -gen_close( struct wm_drive *d ) -{ - if(d->fd != -1) { - wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "closing the device\n"); - close(d->fd); - d->fd = -1; - } - return 0; -} - -/* - * Get the current status of the drive: the current play mode, the absolute - * position from start of disc (in frames), and the current track and index - * numbers if the CD is playing or paused. - */ -int -gen_get_drive_status(struct wm_drive *d, int oldmode, - int *mode, int *pos, int *track, int *index) -{ - struct cd_sub_channel sc; - struct cd_subc_channel_data scd; - - /* If we can't get status, the CD is ejected, so default to that. */ - *mode = WM_CDM_EJECTED; - - sc.sch_address_format = CDROM_MSF_FORMAT; - sc.sch_data_format = CDROM_CURRENT_POSITION; - sc.sch_track_number = 0; - sc.sch_alloc_length = sizeof(scd); - sc.sch_buffer = (caddr_t)&scd; - - /* Is the device open? */ - if (d->fd < 0) - { - switch (wmcd_open(d)) - { - case -1: /* error */ - return (-1); - - case 1: /* retry */ - return (0); - } - } - - if (ioctl(d->fd, CDROM_READ_SUBCHANNEL, &sc)) - return (0); /* ejected */ - - switch (scd.scd_header.sh_audio_status) - { - case AS_PLAY_IN_PROGRESS: - *mode = WM_CDM_PLAYING; - dopos: - *pos = scd.scd_position_data.scp_absaddr.msf.m_units * 60 * 75 + - scd.scd_position_data.scp_absaddr.msf.s_units * 75 + - scd.scd_position_data.scp_absaddr.msf.f_units; - *track = scd.scd_position_data.scp_track_number; - *index = scd.scd_position_data.scp_index_number; - break; - - case AS_PLAY_PAUSED: - if (oldmode == WM_CDM_PLAYING || oldmode == WM_CDM_PAUSED) - { - *mode = WM_CDM_PAUSED; - goto dopos; - } - else - *mode = WM_CDM_STOPPED; - break; - - case AS_PLAY_COMPLETED: - *mode = WM_CDM_TRACK_DONE; /* waiting for next track. */ - break; - - case AS_NO_STATUS: - *mode = WM_CDM_STOPPED; - break; - default: - abort(); - } - - return (0); -} /* gen_get_drive_status() */ - -/* - * Play the CD from one position to another (both in frames.) - */ -int -gen_play( struct wm_drive *d, int start, int end ) -{ - struct cd_play_audio_msf msf; - - msf.msf_starting_M_unit = start / (60*75); - msf.msf_starting_S_unit = (start % (60*75)) / 75; - msf.msf_starting_F_unit = start % 75; - msf.msf_ending_M_unit = end / (60*75); - msf.msf_ending_S_unit = (end % (60*75)) / 75; - msf.msf_ending_F_unit = end % 75; - - if (ioctl(d->fd, SCSI_START_UNIT)) - return (-1); - if (ioctl(d->fd, CDROM_PLAY_AUDIO_MSF, &msf)) - return (-2); - - return (0); -} /* gen_play() */ - -/* - * Pause the CD. - */ -int -gen_pause( struct wm_drive *d ) -{ - return (ioctl(d->fd, CDROM_PAUSE_PLAY, 0)); -} /* gen_pause() */ - -/* - * Resume playing the CD (assuming it was paused.) - */ -int -gen_resume( struct wm_drive *d ) -{ - return (ioctl(d->fd, CDROM_RESUME_PLAY, 0)); -} /* gen_resume() */ - -/* - * Stop the CD. - */ -int -gen_stop( struct wm_drive *d ) -{ - return (ioctl(d->fd, SCSI_STOP_UNIT, 0)); -} /* gen_stop() */ - -/* - * Eject the current CD, if there is one. - */ -int -gen_eject(struct wm_drive *d) -{ - /* On some systems, we can check to see if the CD is mounted. */ - struct stat stbuf; - struct statfs sfsbuf; - - if (fstat(d->fd, &stbuf) != 0) - return (-2); - - /* Is this a mounted filesystem? */ - if (fstatfs(d->fd, &sfsbuf) == 0) - return (-3); - - return (ioctl(d->fd, CDROM_EJECT_CADDY, 0)); -} /* gen_eject() */ - -/*----------------------------------------* - * Close the CD tray - * - * Please edit and send changes to - * milliByte@DeathsDoor.com - *----------------------------------------*/ - -int -gen_closetray(struct wm_drive *d) -{ -#ifdef CAN_CLOSE - if(!close(d->fd)) - { - d->fd=-1; - return(wmcd_reopen(d)); - } else { - return(-1); - } -#else - /* Always succeed if the drive can't close */ - return(0); -#endif /* CAN_CLOSE */ -} /* gen_closetray() */ - -/* - * Get the number of tracks on the CD. - */ -int -gen_get_trackcount(struct wm_drive *d, int *tracks) -{ - struct cd_toc_header hdr; - - if (ioctl(d->fd, CDROM_TOC_HEADER, &hdr)) - return (-1); - - *tracks = hdr.th_ending_track; - - return (0); -} /* gen_get_trackcount() */ - -/* - * Get the start time and mode (data or audio) of a track. - * - * XXX - this should get cached, but that means keeping track of ejects. - */ -int -gen_get_trackinfo(struct wm_drive *d, int track, int *data, int *startframe) -{ - struct cd_toc toc; - struct cd_toc_header hdr; - struct cd_toc_header_and_entries toc_buffer; - - if (ioctl(d->fd, CDROM_TOC_HEADER, &hdr)) - return (-1); - - bzero((char *)&toc_buffer, sizeof(toc_buffer)); - toc.toc_address_format = CDROM_MSF_FORMAT; - toc.toc_starting_track = 0; - toc.toc_alloc_length = (u_short)(((hdr.th_data_len1 << 8) + - hdr.th_data_len0) & 0xfff) + 2; - toc.toc_buffer = (caddr_t)&toc_buffer; - - if (ioctl(d->fd, CDROM_TOC_ENTRYS, &toc)) - return (-1); - - if (track == 0) - track = hdr.th_ending_track + 1; - - *data = (toc_buffer.cdte[track-1].te_control & CDROM_DATA_TRACK) ? 1:0; - *startframe = toc_buffer.cdte[track - 1].te_absaddr.msf.m_units*60*75 + - toc_buffer.cdte[track - 1].te_absaddr.msf.s_units * 75 + - toc_buffer.cdte[track - 1].te_absaddr.msf.f_units; - - return (0); -} /* gen_get_trackinfo() */ - -/* - * Get the number of frames on the CD. - */ -int -gen_get_cdlen( struct wm_drive *d, int *frames ) -{ - int tmp; - - return (gen_get_trackinfo(d, 0, &tmp, frames)); -} /* gen_get_cdlen() */ - -/* - * scale_volume(vol, max) - * - * Return a volume value suitable for passing to the CD-ROM drive. "vol" - * is a volume slider setting; "max" is the slider's maximum value. - * - * On Sun and DEC CD-ROM drives, the amount of sound coming out the jack - * increases much faster toward the top end of the volume scale than it - * does at the bottom. To make up for this, we make the volume scale look - * sort of logarithmic (actually an upside-down inverse square curve) so - * that the volume value passed to the drive changes less and less as you - * approach the maximum slider setting. The actual formula looks like - * - * (max^2 - (max - vol)^2) * (max_volume - min_volume) - * v = --------------------------------------------------- + min_volume - * max^2 - * - * If your system's volume settings aren't broken in this way, something - * like the following should work: - * - * return ((vol * (max_volume - min_volume)) / max + min_volume); - */ -scale_volume(int vol, int max) -{ - return ((max * max - (max - vol) * (max - vol)) * - (max_volume - min_volume) / (max * max) + min_volume); -} /* scale_volume() */ - -/* - * unscale_volume(cd_vol, max) - * - * Given a value between min_volume and max_volume, return the volume slider - * value needed to achieve that value. - * - * Rather than perform floating-point calculations to reverse the above - * formula, we simply do a binary search of scale_volume()'s return values. - */ -static int -unscale_volume( int cd_vol, int max ) -{ - int vol = 0, top = max, bot = 0, scaled; - - while (bot <= top) - { - vol = (top + bot) / 2; - scaled = scale_volume(vol, max); - if (cd_vol == scaled) - break; - if (cd_vol < scaled) - top = vol - 1; - else - bot = vol + 1; - } - - if (vol < 0) - vol = 0; - else if (vol > max) - vol = max; - - return (vol); -} /* unscale_volume() */ - -/* - * Set the volume level for the left and right channels. Their values - * range from 0 to 100. - */ -int -gen_set_volume(struct wm_drive *d, int left, int right) -{ - struct cd_playback pb; - struct cd_playback_status ps; - struct cd_playback_control pc; - - left = scale_volume(left, 100); - right = scale_volume(right, 100); - - bzero((char *)&pb, sizeof(pb)); - bzero((char *)&ps, sizeof(ps)); - bzero((char *)&pc, sizeof(pc)); - - pb.pb_alloc_length = sizeof(ps); - pb.pb_buffer = (caddr_t)&ps; - - if (ioctl(d->fd, CDROM_PLAYBACK_STATUS, &pb)) - return (-1); - - pc.pc_chan0_select = ps.ps_chan0_select; - pc.pc_chan0_volume = (left < CDROM_MIN_VOLUME) ? - CDROM_MIN_VOLUME : (left > CDROM_MAX_VOLUME) ? - CDROM_MAX_VOLUME : left; - pc.pc_chan1_select = ps.ps_chan1_select; - pc.pc_chan1_volume = (right < CDROM_MIN_VOLUME) ? - CDROM_MIN_VOLUME : (right > CDROM_MAX_VOLUME) ? - CDROM_MAX_VOLUME : right; - - pb.pb_alloc_length = sizeof(pc); - pb.pb_buffer = (caddr_t)&pc; - - if (ioctl(d->fd, CDROM_PLAYBACK_CONTROL, &pb)) - return (-1); - - return (0); -} /* gen_set_volume() */ - - -/* - * Read the initial volume from the drive, if available. Each channel - * ranges from 0 to 100, with -1 indicating data not available. - */ -int -gen_get_volume( struct wm_drive *d, int *left, int *right ) -{ - struct cd_playback pb; - struct cd_playback_status ps; - - bzero((char *)&pb, sizeof(pb)); - bzero((char *)&ps, sizeof(ps)); - - pb.pb_alloc_length = sizeof(ps); - pb.pb_buffer = (caddr_t)&ps; - - if (d->fd >= 0) - { - if (ioctl(d->fd, CDROM_PLAYBACK_STATUS, &pb)) - *left = *right = -1; - else - { - *left = unscale_volume(ps.ps_chan0_volume, 100); - *right = unscale_volume(ps.ps_chan1_volume, 100); - } - } - else - *left = *right = -1; - - return (0); -} /* gen_get_volume() */ - -/*------------------------------------------------------------------------* - * gen_get_cdtext(drive, buffer, length) - *------------------------------------------------------------------------*/ - -int -gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length) -{ - return -1; /* no SCSI, no CDTEXT */ -} /* gen_get_cdtext() */ - - -#endif diff --git a/kscd/libwm/scsi.c b/kscd/libwm/scsi.c index d056fe34..37343107 100644 --- a/kscd/libwm/scsi.c +++ b/kscd/libwm/scsi.c @@ -90,7 +90,7 @@ int wm_scsi2_set_volume(struct wm_drive *d, int left, int right); * d Drive structure * buf Buffer for data, both sending and receiving * len Size of buffer - * dir TRUE if the command expects data to be returned in the buffer. + * dir true if the command expects data to be returned in the buffer. * a0- CDB bytes. Either 6, 10, or 12 of them, depending on the command. */ /*VARARGS4*/ diff --git a/kscd/panel.ui b/kscd/panel.ui index c9f12409..c3fd3a09 100644 --- a/kscd/panel.ui +++ b/kscd/panel.ui @@ -451,12 +451,12 @@ <tabstop>cddbPB</tabstop> <tabstop>infoPB</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>playClicked()</slot> <slot>stopClicked()</slot> <slot>prevClicked()</slot> <slot>ejectClicked()</slot> <slot returnType="bool">nextClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/libkcddb/asynccddbplookup.cpp b/libkcddb/asynccddbplookup.cpp index e4642dbe..f5dcf64d 100644 --- a/libkcddb/asynccddbplookup.cpp +++ b/libkcddb/asynccddbplookup.cpp @@ -48,12 +48,12 @@ namespace KCDDB socket_->setBlocking( false ); - connect (socket_, TQT_SIGNAL(gotError(int)), TQT_SLOT(slotGotError(int))); + connect (socket_, TQ_SIGNAL(gotError(int)), TQ_SLOT(slotGotError(int))); - connect (socket_, TQT_SIGNAL( connected(const KResolverEntry &) ), - TQT_SLOT( slotConnectionSuccess() ) ); + connect (socket_, TQ_SIGNAL( connected(const KResolverEntry &) ), + TQ_SLOT( slotConnectionSuccess() ) ); - connect (socket_, TQT_SIGNAL( readyRead() ), TQT_SLOT( slotReadyRead() ) ); + connect (socket_, TQ_SIGNAL( readyRead() ), TQ_SLOT( slotReadyRead() ) ); if ( trackOffsetList.count() < 3 ) return UnknownError; diff --git a/libkcddb/asynchttplookup.cpp b/libkcddb/asynchttplookup.cpp index b6f26051..3e988f2b 100644 --- a/libkcddb/asynchttplookup.cpp +++ b/libkcddb/asynchttplookup.cpp @@ -52,8 +52,8 @@ namespace KCDDB trackOffsetList_ = trackOffsetList; - connect( this, TQT_SIGNAL( queryReady() ), TQT_SLOT( slotQueryReady() ) ); - connect( this, TQT_SIGNAL( readReady() ), TQT_SLOT( requestCDInfoForMatch() ) ); + connect( this, TQ_SIGNAL( queryReady() ), TQ_SLOT( slotQueryReady() ) ); + connect( this, TQ_SIGNAL( readReady() ), TQ_SLOT( requestCDInfoForMatch() ) ); initURL( hostName, port ); @@ -144,10 +144,10 @@ namespace KCDDB if ( 0 == job ) return ServerError; - connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); return Success; } diff --git a/libkcddb/asynchttpsubmit.cpp b/libkcddb/asynchttpsubmit.cpp index 246e5804..6201e886 100644 --- a/libkcddb/asynchttpsubmit.cpp +++ b/libkcddb/asynchttpsubmit.cpp @@ -36,7 +36,7 @@ namespace KCDDB CDDB::Result AsyncHTTPSubmit::runJob(TDEIO::Job* job) { - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotFinished(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotFinished(TDEIO::Job *))); return CDDB::Success; } diff --git a/libkcddb/asyncsmtpsubmit.cpp b/libkcddb/asyncsmtpsubmit.cpp index 1214e951..305f9ce9 100644 --- a/libkcddb/asyncsmtpsubmit.cpp +++ b/libkcddb/asyncsmtpsubmit.cpp @@ -38,8 +38,8 @@ namespace KCDDB CDDB::Result AsyncSMTPSubmit::runJob(TDEIO::Job* job) { - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT(slotDone( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT(slotDone( TDEIO::Job* ) ) ); return Success; } diff --git a/libkcddb/cache.cpp b/libkcddb/cache.cpp index 5e57b35a..10aa683a 100644 --- a/libkcddb/cache.cpp +++ b/libkcddb/cache.cpp @@ -20,7 +20,7 @@ */ #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include <tqdir.h> diff --git a/libkcddb/cache.h b/libkcddb/cache.h index 7839ba33..939c9b36 100644 --- a/libkcddb/cache.h +++ b/libkcddb/cache.h @@ -26,10 +26,10 @@ #include <tqstring.h> #include "cdinfo.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace KCDDB { - class KDE_EXPORT Cache + class TDE_EXPORT Cache { public: diff --git a/libkcddb/cddb.h b/libkcddb/cddb.h index 1e397467..5f95c815 100644 --- a/libkcddb/cddb.h +++ b/libkcddb/cddb.h @@ -43,7 +43,7 @@ namespace KCDDB /** This is just a container class used for interpreting results of CDDB queries. */ - class KDE_EXPORT CDDB + class TDE_EXPORT CDDB { public: diff --git a/libkcddb/cdinfo.h b/libkcddb/cdinfo.h index cafaab53..15984b11 100644 --- a/libkcddb/cdinfo.h +++ b/libkcddb/cdinfo.h @@ -24,7 +24,7 @@ #include <tqstringlist.h> #include <tqvaluelist.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tqvariant.h> namespace KCDDB @@ -32,7 +32,7 @@ namespace KCDDB /** * Information about a sepecific track in a cd. */ - class KDE_EXPORT TrackInfo + class TDE_EXPORT TrackInfo { public: @@ -65,7 +65,7 @@ namespace KCDDB * cddb->lookup(discSignature); * CDInfo info = cddb->bestLookupResponse();</code> */ - class KDE_EXPORT CDInfo + class TDE_EXPORT CDInfo { public: diff --git a/libkcddb/cdinfodialogbase.ui b/libkcddb/cdinfodialogbase.ui index 65948217..3c6a386f 100644 --- a/libkcddb/cdinfodialogbase.ui +++ b/libkcddb/cdinfodialogbase.ui @@ -398,12 +398,12 @@ <variable access="public">static const unsigned TRACK_TITLE = 2;</variable> <variable access="public">static const unsigned TRACK_COMMENT = 3;</variable> </variables> -<Q_SIGNALS> +<signals> <signal>play(int i)</signal> <signal>discInfoClicked()</signal> <signal>trackInfoClicked(unsigned)</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot access="protected">slotTrackSelected( TQListViewItem * item )</slot> <slot access="protected">slotNextTrack()</slot> <slot access="protected">slotTrackDoubleClicked( TQListViewItem * item, const TQPoint &, int column )</slot> @@ -412,7 +412,7 @@ <slot>genreChanged( const TQString & newGenre )</slot> <slot>slotMultipleArtists( bool hasMultipleArtist )</slot> <slot access="private">slotChangeEncoding()</slot> -</Q_SLOTS> +</slots> <functions> <function access="private" specifier="non virtual">init()</function> <function access="private" specifier="non virtual">destroy()</function> diff --git a/libkcddb/cdinfoencodingwidget.cpp b/libkcddb/cdinfoencodingwidget.cpp index f2a7e578..6714c56b 100644 --- a/libkcddb/cdinfoencodingwidget.cpp +++ b/libkcddb/cdinfoencodingwidget.cpp @@ -37,8 +37,8 @@ namespace KCDDB slotEncodingChanged(encodingCombo->currentText()); - connect(encodingCombo,TQT_SIGNAL(activated(const TQString&)), - this,TQT_SLOT(slotEncodingChanged(const TQString&))); + connect(encodingCombo,TQ_SIGNAL(activated(const TQString&)), + this,TQ_SLOT(slotEncodingChanged(const TQString&))); } TQString CDInfoEncodingWidget::selectedEncoding() diff --git a/libkcddb/client.cpp b/libkcddb/client.cpp index c1a0102a..38ba5aea 100644 --- a/libkcddb/client.cpp +++ b/libkcddb/client.cpp @@ -177,16 +177,16 @@ namespace KCDDB cdInfoLookup = new AsyncCDDBPLookup(); connect( static_cast<AsyncCDDBPLookup *>( cdInfoLookup ), - TQT_SIGNAL( finished( CDDB::Result ) ), - TQT_SLOT( slotFinished( CDDB::Result ) ) ); + TQ_SIGNAL( finished( CDDB::Result ) ), + TQ_SLOT( slotFinished( CDDB::Result ) ) ); } else { cdInfoLookup = new AsyncHTTPLookup(); connect( static_cast<AsyncHTTPLookup *>( cdInfoLookup ), - TQT_SIGNAL( finished( CDDB::Result ) ), - TQT_SLOT( slotFinished( CDDB::Result ) ) ); + TQ_SIGNAL( finished( CDDB::Result ) ), + TQ_SLOT( slotFinished( CDDB::Result ) ) ); } r = cdInfoLookup->lookup( d->config.hostname(), @@ -267,8 +267,8 @@ namespace KCDDB { cdInfoSubmit = new AsyncHTTPSubmit(from, hostname, port); connect( static_cast<AsyncHTTPSubmit *>( cdInfoSubmit ), - TQT_SIGNAL(finished( CDDB::Result ) ), - TQT_SLOT( slotSubmitFinished( CDDB::Result ) ) ); + TQ_SIGNAL(finished( CDDB::Result ) ), + TQ_SLOT( slotSubmitFinished( CDDB::Result ) ) ); } break; @@ -285,8 +285,8 @@ namespace KCDDB { cdInfoSubmit = new AsyncSMTPSubmit( hostname, port, username, from, d->config.submitAddress() ); connect( static_cast<AsyncSMTPSubmit *>( cdInfoSubmit ), - TQT_SIGNAL( finished( CDDB::Result ) ), - TQT_SLOT( slotSubmitFinished( CDDB::Result ) ) ); + TQ_SIGNAL( finished( CDDB::Result ) ), + TQ_SLOT( slotSubmitFinished( CDDB::Result ) ) ); } break; } diff --git a/libkcddb/client.h b/libkcddb/client.h index c28d763e..fd4cdbf5 100644 --- a/libkcddb/client.h +++ b/libkcddb/client.h @@ -25,7 +25,7 @@ #include "cdinfo.h" #include <tqobject.h> #include "cddb.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace KCDDB { @@ -40,7 +40,7 @@ namespace KCDDB * cddb->lookup(discSignature); * CDInfo info = cddb->bestLookupResponse();</code> */ - class KDE_EXPORT Client : public TQObject + class TDE_EXPORT Client : public TQObject { TQ_OBJECT diff --git a/libkcddb/config.h b/libkcddb/config.h index adfd59f2..1f5ec8a4 100644 --- a/libkcddb/config.h +++ b/libkcddb/config.h @@ -30,7 +30,7 @@ #include <tdelibs_export.h> namespace KCDDB { - class KDE_EXPORT Config : public ConfigBase + class TDE_EXPORT Config : public ConfigBase { public: Config(); diff --git a/libkcddb/configbase.kcfgc b/libkcddb/configbase.kcfgc index fe089fc8..0cde4e52 100644 --- a/libkcddb/configbase.kcfgc +++ b/libkcddb/configbase.kcfgc @@ -1,4 +1,4 @@ ClassName=ConfigBase File=libkcddb.kcfg Mutators=true -Visibility=KDE_EXPORT +Visibility=TDE_EXPORT diff --git a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui index 8da249db..8ea060f9 100644 --- a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui +++ b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui @@ -580,11 +580,11 @@ <tabstop>kcfg_port</tabstop> <tabstop>kcfg_lookupTransport</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">protocolChanged()</slot> <slot access="protected">showMirrorList()</slot> <slot access="protected">needAuthenticationChanged(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="11" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/libkcddb/sites.h b/libkcddb/sites.h index eaa3dacb..c06b1762 100644 --- a/libkcddb/sites.h +++ b/libkcddb/sites.h @@ -36,7 +36,7 @@ namespace KCDDB TQString description; } ; - class KDE_EXPORT Sites : public CDDB + class TDE_EXPORT Sites : public CDDB { public: Sites(); diff --git a/libkcddb/test/asynccddblookuptest.cpp b/libkcddb/test/asynccddblookuptest.cpp index e9100c40..6a43b0ca 100644 --- a/libkcddb/test/asynccddblookuptest.cpp +++ b/libkcddb/test/asynccddblookuptest.cpp @@ -22,8 +22,8 @@ AsyncCDDBLookupTest::AsyncCDDBLookupTest() connect ( client_, - TQT_SIGNAL(finished(CDDB::Result)), - TQT_SLOT(slotFinished(CDDB::Result)) + TQ_SIGNAL(finished(CDDB::Result)), + TQ_SLOT(slotFinished(CDDB::Result)) ); TrackOffsetList list; @@ -96,7 +96,7 @@ AsyncCDDBLookupTest::slotFinished(CDDB::Result r) kdDebug() << "Best CDInfo had title: " << i.title << endl; kdDebug() << "and revision: " << i.revision << endl; - kapp->quit(); + tdeApp->quit(); } int main(int argc, char ** argv) diff --git a/libkcddb/test/asynchttplookuptest.cpp b/libkcddb/test/asynchttplookuptest.cpp index 045e6b15..f614b468 100644 --- a/libkcddb/test/asynchttplookuptest.cpp +++ b/libkcddb/test/asynchttplookuptest.cpp @@ -21,8 +21,8 @@ AsyncHTTPLookupTest::AsyncHTTPLookupTest() connect ( client_, - TQT_SIGNAL(finished(CDDB::Result)), - TQT_SLOT(slotFinished(CDDB::Result)) + TQ_SIGNAL(finished(CDDB::Result)), + TQ_SLOT(slotFinished(CDDB::Result)) ); TrackOffsetList list; @@ -94,7 +94,7 @@ AsyncHTTPLookupTest::slotFinished(CDDB::Result r) kdDebug() << "Best CDInfo had title: " << i.title << endl; kdDebug() << "and revision: " << i.revision << endl; - kapp->quit(); + tdeApp->quit(); } int main(int argc, char ** argv) diff --git a/libkcddb/test/asynchttpsubmittest.cpp b/libkcddb/test/asynchttpsubmittest.cpp index 0dd0766e..425f5873 100644 --- a/libkcddb/test/asynchttpsubmittest.cpp +++ b/libkcddb/test/asynchttpsubmittest.cpp @@ -51,8 +51,8 @@ AsyncHTTPSubmitTest::AsyncHTTPSubmitTest() connect ( client_, - TQT_SIGNAL(finished(CDDB::Result)), - TQT_SLOT(slotFinished(CDDB::Result)) + TQ_SIGNAL(finished(CDDB::Result)), + TQ_SLOT(slotFinished(CDDB::Result)) ); client_->submit(cdInfo, list); @@ -63,7 +63,7 @@ AsyncHTTPSubmitTest::slotFinished(CDDB::Result r) { kdDebug() << "AsyncHTTPSubmitTest::slotFinished: Got " << KCDDB::CDDB::resultToString(r) << endl; - kapp->quit(); + tdeApp->quit(); } int main(int argc, char ** argv) diff --git a/libkcddb/test/asyncsmtpsubmittest.cpp b/libkcddb/test/asyncsmtpsubmittest.cpp index 72ee0adc..a146bb11 100644 --- a/libkcddb/test/asyncsmtpsubmittest.cpp +++ b/libkcddb/test/asyncsmtpsubmittest.cpp @@ -52,8 +52,8 @@ AsyncSMTPSubmitTest::AsyncSMTPSubmitTest() connect ( client_, - TQT_SIGNAL(finished(CDDB::Result)), - TQT_SLOT(slotFinished(CDDB::Result)) + TQ_SIGNAL(finished(CDDB::Result)), + TQ_SLOT(slotFinished(CDDB::Result)) ); client_->submit(cdInfo, list); @@ -64,7 +64,7 @@ AsyncSMTPSubmitTest::slotFinished(CDDB::Result r) { kdDebug() << "AsyncSMTPSubmitTest::slotFinished: Got " << KCDDB::CDDB::resultToString(r) << endl; - kapp->quit(); + tdeApp->quit(); } int main(int argc, char ** argv) diff --git a/mpeglib/example/yaf/yafcore/buffer.h b/mpeglib/example/yaf/yafcore/buffer.h index 7c1a3d5c..ae008d6c 100644 --- a/mpeglib/example/yaf/yafcore/buffer.h +++ b/mpeglib/example/yaf/yafcore/buffer.h @@ -22,9 +22,9 @@ extern "C" { #include <string.h> #include <stdio.h> } -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT Buffer { +class TDE_EXPORT Buffer { char* msg; int nSize; diff --git a/mpeglib/example/yaf/yafcore/commandTable.h b/mpeglib/example/yaf/yafcore/commandTable.h index 75dd4325..679913cc 100644 --- a/mpeglib/example/yaf/yafcore/commandTable.h +++ b/mpeglib/example/yaf/yafcore/commandTable.h @@ -21,7 +21,7 @@ extern"C" { #include <stdio.h> } -#include <kdemacros.h> +#include <tdemacros.h> #define _CT_START 40 @@ -47,7 +47,7 @@ struct CommandDescriptionStruct { typedef struct CommandDescriptionStruct CommandDescription; -class KDE_EXPORT CommandTable { +class TDE_EXPORT CommandTable { int nCommandDesc; CommandDescription commandDesc[50]; diff --git a/mpeglib/example/yaf/yafcore/inputDecoder.h b/mpeglib/example/yaf/yafcore/inputDecoder.h index 0a5623a0..aa22337d 100644 --- a/mpeglib/example/yaf/yafcore/inputDecoder.h +++ b/mpeglib/example/yaf/yafcore/inputDecoder.h @@ -19,7 +19,7 @@ #include "outputInterface.h" #include <strings.h> -#include <kdemacros.h> +#include <tdemacros.h> #define _DECODER_STATUS_IDLE 1 #define _DECODER_STATUS_WORKING 2 @@ -29,7 +29,7 @@ class CommandTable; class CommandTableYAF; class CommandLine; -class KDE_EXPORT InputDecoder { +class TDE_EXPORT InputDecoder { int status; CommandTable* commandTable; diff --git a/mpeglib/example/yaf/yafcore/inputInterface.h b/mpeglib/example/yaf/yafcore/inputInterface.h index f3ea0065..2f2ffd44 100644 --- a/mpeglib/example/yaf/yafcore/inputInterface.h +++ b/mpeglib/example/yaf/yafcore/inputInterface.h @@ -18,7 +18,7 @@ #include "buffer.h" #include <fstream> -#include <kdemacros.h> +#include <tdemacros.h> extern "C" { #include <unistd.h> @@ -37,7 +37,7 @@ extern "C" { class MultiReader; -class KDE_EXPORT InputInterface { +class TDE_EXPORT InputInterface { int currentCommandNumber; diff --git a/mpeglib/example/yaf/yafcore/outputInterface.h b/mpeglib/example/yaf/yafcore/outputInterface.h index 0a24fd92..616c1eb7 100644 --- a/mpeglib/example/yaf/yafcore/outputInterface.h +++ b/mpeglib/example/yaf/yafcore/outputInterface.h @@ -21,14 +21,14 @@ #include <pthread.h> #include <fstream> #include "buffer.h" -#include <kdemacros.h> +#include <tdemacros.h> // uncomment this for debugging the output stream // (written to file outstream.dbg) //#define _DEBUG_OUTPUT -class KDE_EXPORT OutputInterface { +class TDE_EXPORT OutputInterface { int protocolSyntax; int nr; diff --git a/mpeglib/example/yaf/yafcore/yaf_control.h b/mpeglib/example/yaf/yafcore/yaf_control.h index 890a1bb8..14cf921f 100644 --- a/mpeglib/example/yaf/yafcore/yaf_control.h +++ b/mpeglib/example/yaf/yafcore/yaf_control.h @@ -13,13 +13,13 @@ #include <unistd.h> #include <fcntl.h> #include <stdio.h> -#include <kdemacros.h> +#include <tdemacros.h> // prototypes //extern "C" void control_xplayer(); -KDE_EXPORT void yaf_control(InputInterface* input, +TDE_EXPORT void yaf_control(InputInterface* input, OutputInterface* output, InputDecoder* decoder); diff --git a/mpeglib/example/yaf/yafxplayer/inputDecoderYAF.h b/mpeglib/example/yaf/yafxplayer/inputDecoderYAF.h index 2002dc58..1abc4452 100644 --- a/mpeglib/example/yaf/yafxplayer/inputDecoderYAF.h +++ b/mpeglib/example/yaf/yafxplayer/inputDecoderYAF.h @@ -20,10 +20,10 @@ #include "inputDecoderXPlayer.h" #include "yafOutputStream.h" -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT InputDecoderYAF : public InputDecoderXPlayer { +class TDE_EXPORT InputDecoderYAF : public InputDecoderXPlayer { DecoderPlugin* plugin; YafOutputStream* output; diff --git a/mpeglib/example/yaf/yafxplayer/yafOutputStream.h b/mpeglib/example/yaf/yafxplayer/yafOutputStream.h index bb7df423..70e26974 100644 --- a/mpeglib/example/yaf/yafxplayer/yafOutputStream.h +++ b/mpeglib/example/yaf/yafxplayer/yafOutputStream.h @@ -41,7 +41,7 @@ #include <unistd.h> #include <sys/types.h> #include <sys/socket.h> -#include <kdemacros.h> +#include <tdemacros.h> // If you get compile errors when using mpeglib // simply remove the yaf dependencies @@ -49,7 +49,7 @@ -class KDE_EXPORT YafOutputStream : public OutputStream { +class TDE_EXPORT YafOutputStream : public OutputStream { long bytes; diff --git a/mpeglib/lib/CMakeLists.txt b/mpeglib/lib/CMakeLists.txt index ad500d03..7b3dab41 100644 --- a/mpeglib/lib/CMakeLists.txt +++ b/mpeglib/lib/CMakeLists.txt @@ -63,7 +63,7 @@ tde_add_library( mpeg SHARED mcop kmedia2_idl soundserver_idl artsflow_idl artsmodules-shared X11 ${XEXT_LIBRARIES} m ${XV_LIBRARIES} ${DGA_LIBRARIES} ${XVIDMODE_LIBRARIES} ${CDPARANOIA_LIBRARIES} ${OGG_LIBRARIES} ${VORBIS_LIBRARIES} ${VORBISFILE_LIBRARIES} - pthread + ${CMAKE_THREAD_LIBS_INIT} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/mpeglib/lib/decoder/decoderPlugin.h b/mpeglib/lib/decoder/decoderPlugin.h index b616ed51..1737b7b6 100644 --- a/mpeglib/lib/decoder/decoderPlugin.h +++ b/mpeglib/lib/decoder/decoderPlugin.h @@ -26,7 +26,7 @@ #include "../output/outPlugin.h" #include "../util/timeWrapper.h" -#include <kdemacros.h> +#include <tdemacros.h> /** Note: streamstate can be "or'ed" for the waitStreamState call @@ -75,7 +75,7 @@ */ -class KDE_EXPORT DecoderPlugin { +class TDE_EXPORT DecoderPlugin { public: diff --git a/mpeglib/lib/decoder/mpgPlugin.h b/mpeglib/lib/decoder/mpgPlugin.h index 79d986cc..8077ddde 100644 --- a/mpeglib/lib/decoder/mpgPlugin.h +++ b/mpeglib/lib/decoder/mpgPlugin.h @@ -16,7 +16,7 @@ #define __MPGPLUGIN_H #include "../decoder/decoderPlugin.h" -#include <kdemacros.h> +#include <tdemacros.h> #define _INSERT_NO 0 #define _INSERT_VIDEO 1 @@ -28,7 +28,7 @@ class MpegSystemStream; class MpegStreamPlayer; class MpegVideoLength; -class KDE_EXPORT MpgPlugin : public DecoderPlugin { +class TDE_EXPORT MpgPlugin : public DecoderPlugin { MpegSystemHeader* mpegSystemHeader; MpegSystemStream* mpegSystemStream; diff --git a/mpeglib/lib/decoder/nukePlugin.h b/mpeglib/lib/decoder/nukePlugin.h index a7df2495..7a5a16a3 100644 --- a/mpeglib/lib/decoder/nukePlugin.h +++ b/mpeglib/lib/decoder/nukePlugin.h @@ -16,9 +16,9 @@ #include "../decoder/decoderPlugin.h" -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT NukePlugin : public DecoderPlugin { +class TDE_EXPORT NukePlugin : public DecoderPlugin { public: diff --git a/mpeglib/lib/decoder/splayPlugin.h b/mpeglib/lib/decoder/splayPlugin.h index d7eed4ec..cc230874 100644 --- a/mpeglib/lib/decoder/splayPlugin.h +++ b/mpeglib/lib/decoder/splayPlugin.h @@ -15,7 +15,7 @@ #define __SPLAYPLUGIN_H #include "../decoder/decoderPlugin.h" -#include <kdemacros.h> +#include <tdemacros.h> class SplayDecoder; class MpegAudioFrame; @@ -25,7 +25,7 @@ class PCMFrame; class FileAccessWrapper; class MpegAudioInfo; -class KDE_EXPORT SplayPlugin : public DecoderPlugin { +class TDE_EXPORT SplayPlugin : public DecoderPlugin { int lnoLength; int lfirst; diff --git a/mpeglib/lib/decoder/tplayPlugin.h b/mpeglib/lib/decoder/tplayPlugin.h index daa0de74..530e1e44 100644 --- a/mpeglib/lib/decoder/tplayPlugin.h +++ b/mpeglib/lib/decoder/tplayPlugin.h @@ -15,13 +15,13 @@ #define __TPLAYPLUGIN_H #include "../decoder/decoderPlugin.h" -#include <kdemacros.h> +#include <tdemacros.h> /** The tplayPlugin is ugly and needs a rewrite. Im not sure if you can make mutiple instances of it */ -class KDE_EXPORT TplayPlugin : public DecoderPlugin { +class TDE_EXPORT TplayPlugin : public DecoderPlugin { struct info_struct* info; class TimeStamp* startStamp; diff --git a/mpeglib/lib/frame/IOFrameQueue.h b/mpeglib/lib/frame/IOFrameQueue.h index d56f25aa..e21f9157 100644 --- a/mpeglib/lib/frame/IOFrameQueue.h +++ b/mpeglib/lib/frame/IOFrameQueue.h @@ -16,7 +16,7 @@ #define __IOFRAMEQUEUE_H #include "frameQueue.h" -#include <kdemacros.h> +#include <tdemacros.h> /** This class can store up to <size> frames. @@ -31,7 +31,7 @@ */ -class KDE_EXPORT IOFrameQueue { +class TDE_EXPORT IOFrameQueue { public: diff --git a/mpeglib/lib/frame/audioFrame.h b/mpeglib/lib/frame/audioFrame.h index b1c586c3..c9707326 100644 --- a/mpeglib/lib/frame/audioFrame.h +++ b/mpeglib/lib/frame/audioFrame.h @@ -29,12 +29,12 @@ #include "frame.h" -#include <kdemacros.h> +#include <tdemacros.h> #define SCALFACTOR SHRT_MAX #define MP3FRAMESIZE (2*2*2*32*18) -class KDE_EXPORT AudioFrame : public Frame { +class TDE_EXPORT AudioFrame : public Frame { int stereo; int frequencyHZ; diff --git a/mpeglib/lib/frame/audioFrameQueue.h b/mpeglib/lib/frame/audioFrameQueue.h index 7e7a01c0..fe133e68 100644 --- a/mpeglib/lib/frame/audioFrameQueue.h +++ b/mpeglib/lib/frame/audioFrameQueue.h @@ -19,7 +19,7 @@ #include "floatFrame.h" #include "pcmFrame.h" -#include <kdemacros.h> +#include <tdemacros.h> /** This class solves the problem that we produce audioFrames @@ -28,7 +28,7 @@ This class can convert from packets back to a stream. */ -class KDE_EXPORT AudioFrameQueue : public IOFrameQueue { +class TDE_EXPORT AudioFrameQueue : public IOFrameQueue { int frameType; int len; diff --git a/mpeglib/lib/frame/framer.h b/mpeglib/lib/frame/framer.h index 51c4b26e..b90df946 100644 --- a/mpeglib/lib/frame/framer.h +++ b/mpeglib/lib/frame/framer.h @@ -19,7 +19,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <kdemacros.h> +#include <tdemacros.h> #define FRAME_NEED 0 #define FRAME_WORK 1 @@ -70,7 +70,7 @@ -class KDE_EXPORT Framer { +class TDE_EXPORT Framer { // this is our destination buffer for the output frame // this buffer must be able to store the maximum size diff --git a/mpeglib/lib/frame/pcmFrame.h b/mpeglib/lib/frame/pcmFrame.h index a19941bc..029f0eab 100644 --- a/mpeglib/lib/frame/pcmFrame.h +++ b/mpeglib/lib/frame/pcmFrame.h @@ -17,10 +17,10 @@ #include "audioFrame.h" -#include <kdemacros.h> +#include <tdemacros.h> // this format has a sampleSize of 16, signed, endian==machine -class KDE_EXPORT PCMFrame : public AudioFrame { +class TDE_EXPORT PCMFrame : public AudioFrame { short int* data; int len; diff --git a/mpeglib/lib/input/inputPlugin.h b/mpeglib/lib/input/inputPlugin.h index 5ac68307..f6b65f34 100644 --- a/mpeglib/lib/input/inputPlugin.h +++ b/mpeglib/lib/input/inputPlugin.h @@ -25,11 +25,11 @@ #include <string.h> #include "inputDetector.h" -#include <kdemacros.h> +#include <tdemacros.h> #define _INPUT_THREADSAFE 1 -class KDE_EXPORT InputPlugin { +class TDE_EXPORT InputPlugin { public: InputPlugin(); diff --git a/mpeglib/lib/output/outPlugin.h b/mpeglib/lib/output/outPlugin.h index b70620a6..b606d444 100644 --- a/mpeglib/lib/output/outPlugin.h +++ b/mpeglib/lib/output/outPlugin.h @@ -18,7 +18,7 @@ #include "dspX11OutputStream.h" #include "artsOutputStream.h" #include "threadSafeOutputStream.h" -#include <kdemacros.h> +#include <tdemacros.h> #define _OUTPUT_LOCAL 1 #define _OUTPUT_EMPTY 2 @@ -27,7 +27,7 @@ #define _OUTPUT_THREADSAFE 1 -class KDE_EXPORT OutPlugin { +class TDE_EXPORT OutPlugin { public: OutPlugin(); diff --git a/mpeglib/lib/output/outputStream.h b/mpeglib/lib/output/outputStream.h index 9ef538fd..ae856976 100644 --- a/mpeglib/lib/output/outputStream.h +++ b/mpeglib/lib/output/outputStream.h @@ -20,7 +20,7 @@ #include "pluginInfo.h" #include "../util/render/pictureArray.h" #include "../util/abstract/abs_thread.h" -#include <kdemacros.h> +#include <tdemacros.h> #define _OUTPUT_WAIT_METHOD_BLOCK 1 #define _OUTPUT_WAIT_METHOD_POLL 2 @@ -76,7 +76,7 @@ -class KDE_EXPORT OutputStream { +class TDE_EXPORT OutputStream { int audioState; int videoState; diff --git a/mpeglib/lib/output/pluginInfo.h b/mpeglib/lib/output/pluginInfo.h index 7026fce9..585ef7ba 100644 --- a/mpeglib/lib/output/pluginInfo.h +++ b/mpeglib/lib/output/pluginInfo.h @@ -16,7 +16,7 @@ #define __PLUGININFO_H #include "../util/dynBuffer.h" -#include <kdemacros.h> +#include <tdemacros.h> /** Here we have the base class for all additional information @@ -26,7 +26,7 @@ */ -class KDE_EXPORT PluginInfo { +class TDE_EXPORT PluginInfo { int sec; DynBuffer* musicName; diff --git a/mpeglib/lib/splay/mpegAudioFrame.h b/mpeglib/lib/splay/mpegAudioFrame.h index 8b4f6c4f..911307cd 100644 --- a/mpeglib/lib/splay/mpegAudioFrame.h +++ b/mpeglib/lib/splay/mpegAudioFrame.h @@ -17,7 +17,7 @@ #include "mpegAudioHeader.h" #include "../frame/framer.h" -#include <kdemacros.h> +#include <tdemacros.h> /* Here we are framing from raw to mpeg audio. @@ -26,7 +26,7 @@ -class KDE_EXPORT MpegAudioFrame : public Framer { +class TDE_EXPORT MpegAudioFrame : public Framer { // max size of buffer is: // header: 4 diff --git a/mpeglib/lib/splay/splayDecoder.h b/mpeglib/lib/splay/splayDecoder.h index acbfdbfc..d91faa33 100644 --- a/mpeglib/lib/splay/splayDecoder.h +++ b/mpeglib/lib/splay/splayDecoder.h @@ -29,7 +29,7 @@ #include "../frame/audioFrame.h" #include "dump.h" #include <string.h> -#include <kdemacros.h> +#include <tdemacros.h> class Mpegtoraw; class MpegAudioStream; @@ -46,7 +46,7 @@ class MpegAudioHeader; -class KDE_EXPORT SplayDecoder { +class TDE_EXPORT SplayDecoder { MpegAudioStream* stream; MpegAudioHeader* header; diff --git a/mpeglib/lib/util/abstract/abs_thread.h b/mpeglib/lib/util/abstract/abs_thread.h index 0da7e2a0..f65445d8 100644 --- a/mpeglib/lib/util/abstract/abs_thread.h +++ b/mpeglib/lib/util/abstract/abs_thread.h @@ -83,7 +83,7 @@ typedef SDL_mutex* abs_thread_mutex_t; typedef SDL_cond* abs_thread_cond_t; typedef SDL_Thread* abs_thread_t; -// TQT_SIGNAL FUNCTIONS +// SIGNAL FUNCTIONS // note we have _no_ cond attribut (not needed) int abs_thread_cond_init(abs_thread_cond_t* cond); int abs_thread_cond_destroy(abs_thread_cond_t *cond); diff --git a/mpeglib/lib/util/audio/audioIO_BeOS.cpp b/mpeglib/lib/util/audio/audioIO_BeOS.cpp index ff73cd57..3c221f0e 100644 --- a/mpeglib/lib/util/audio/audioIO_BeOS.cpp +++ b/mpeglib/lib/util/audio/audioIO_BeOS.cpp @@ -145,7 +145,7 @@ int audioRead(char *buffer, int count) bool stream_func(void *arg, char *buf, size_t count, void *header) { audioRead(buf, count); - return TRUE; + return true; } void audioOpen() { diff --git a/mpeglib/lib/util/audio/dspWrapper.h b/mpeglib/lib/util/audio/dspWrapper.h index f323096d..6a6fd5be 100644 --- a/mpeglib/lib/util/audio/dspWrapper.h +++ b/mpeglib/lib/util/audio/dspWrapper.h @@ -18,7 +18,7 @@ class AudioFrame; class PCMFrame; class FloatFrame; -#include <kdemacros.h> +#include <tdemacros.h> /** This class wraps the platform specific /dev/dsp implementation. @@ -32,7 +32,7 @@ class FloatFrame; But a caller can do it in both orders. */ -class KDE_EXPORT DSPWrapper { +class TDE_EXPORT DSPWrapper { int lopenDevice; int lopenMixer; diff --git a/mpeglib/lib/util/timeWrapper.h b/mpeglib/lib/util/timeWrapper.h index 608d5bd0..435b86db 100644 --- a/mpeglib/lib/util/timeWrapper.h +++ b/mpeglib/lib/util/timeWrapper.h @@ -23,14 +23,14 @@ #include <strings.h> #endif -#include <kdemacros.h> +#include <tdemacros.h> typedef struct timeval_s { long tv_sec; /* seconds */ long tv_usec; /* microseconds */ } timeval_t; -class KDE_EXPORT TimeWrapper { +class TDE_EXPORT TimeWrapper { public: TimeWrapper(); diff --git a/mpeglib/lib/yuv/yuvPlugin.h b/mpeglib/lib/yuv/yuvPlugin.h index 4a5dc72b..238b01f6 100644 --- a/mpeglib/lib/yuv/yuvPlugin.h +++ b/mpeglib/lib/yuv/yuvPlugin.h @@ -18,9 +18,9 @@ #define __YUVPLUGIN_H #include "../decoder/decoderPlugin.h" -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT YUVPlugin : public DecoderPlugin { +class TDE_EXPORT YUVPlugin : public DecoderPlugin { int lCalcLength; int nWidth; diff --git a/mpg123_artsplugin/mpg123PlayObject_impl.h b/mpg123_artsplugin/mpg123PlayObject_impl.h index e8be2619..8c08df79 100644 --- a/mpg123_artsplugin/mpg123PlayObject_impl.h +++ b/mpg123_artsplugin/mpg123PlayObject_impl.h @@ -3,7 +3,7 @@ using namespace std; -#if (defined(__GNU_LIBRARY__) && defined(_SEM_SEMUN_UNDEFINED)) || defined(__osf__) || defined(__sun__) +#if (defined(__GNU_LIBRARY__) && defined(_SEM_SEMUN_UNDEFINED)) || defined(__sun__) /* union semun is defined by including <sys/sem.h> */ /* according to X/OPEN we have to define it ourselves */ union semun { diff --git a/noatun/app/main.cpp b/noatun/app/main.cpp index d39b2735..85f6571c 100644 --- a/noatun/app/main.cpp +++ b/noatun/app/main.cpp @@ -14,7 +14,7 @@ static TDECmdLineOptions options[] = TDECmdLineLastOption }; -extern "C" KDE_EXPORT int kdemain(int argc, char **argv) +extern "C" TDE_EXPORT int kdemain(int argc, char **argv) { TDEAboutData aboutData("noatun", I18N_NOOP("Noatun"), version, description, TDEAboutData::License_BSD, diff --git a/noatun/library/CMakeLists.txt b/noatun/library/CMakeLists.txt index 69b9cdd0..0be30314 100644 --- a/noatun/library/CMakeLists.txt +++ b/noatun/library/CMakeLists.txt @@ -58,7 +58,7 @@ tde_add_library( noatun SHARED AUTOMOC ${CMAKE_CURRENT_SOURCE_DIR}/noatun VERSION 1.2.0 LINK - DCOP-shared tdeio-shared artskde-shared ${DL_LIBRARIES} + DCOP-shared tdeio-shared artskde-shared ${CMAKE_DL_LIBS} ${NOATUN_ARTS_LIBRARIES} mcop qtmcop kmedia2_idl soundserver_idl artsflow noatunarts-shared @@ -75,7 +75,7 @@ tde_add_library( noatuncontrols SHARED AUTOMOC ${CMAKE_CURRENT_SOURCE_DIR}/noatun VERSION 1.2.0 LINK - tdecore-shared tdeui-shared ${DL_LIBRARIES} + tdecore-shared tdeui-shared ${CMAKE_DL_LIBS} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp index 1bd1fb6b..66b0907b 100644 --- a/noatun/library/app.cpp +++ b/noatun/library/app.cpp @@ -52,7 +52,7 @@ struct NoatunApp::Private NoatunApp::NoatunApp() - : KUniqueApplication(true, true, true), mPluginMenu(0), mPluginActionMenu(0), mEqualizer(0) + : TDEUniqueApplication(true, true, true), mPluginMenu(0), mPluginActionMenu(0), mEqualizer(0) { d = new Private; d->vequalizer=0; @@ -88,9 +88,9 @@ NoatunApp::NoatunApp() mLibraryLoader->add("dcopiface.plugin"); - new General(TQT_TQOBJECT(this)); // 25 - new Plugins(TQT_TQOBJECT(this)); // 149 -// new Types(TQT_TQOBJECT(this)); + new General(this); // 25 + new Plugins(this); // 149 +// new Types(this); mPlayer=new Player; // 139 d->effects=new Effects; // 1 @@ -101,7 +101,7 @@ NoatunApp::NoatunApp() mEffectView=new EffectView; // 859 mEqualizerView=new EqualizerView; // 24 - TQTimer::singleShot(0, mDownloader, TQT_SLOT(start())); + TQTimer::singleShot(0, mDownloader, TQ_SLOT(start())); ::globalVideo = new GlobalVideo; @@ -363,7 +363,7 @@ void NoatunApp::pluginMenuRemove(int id) NoatunStdAction::PluginActionMenu *NoatunApp::pluginActionMenu() { if (!mPluginActionMenu) - mPluginActionMenu = new NoatunStdAction::PluginActionMenu(TQT_TQOBJECT(this), "menu_actions"); + mPluginActionMenu = new NoatunStdAction::PluginActionMenu(this, "menu_actions"); return mPluginActionMenu; } diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp index 92058c85..7c5e1a99 100644 --- a/noatun/library/cmodule.cpp +++ b/noatun/library/cmodule.cpp @@ -64,8 +64,8 @@ General::General(TQObject *parent) TQLabel *dlsaver=new TQLabel(i18n("&Download folder:"), this); mDlSaver=new KURLRequester(napp->saveDirectory(), this); dlsaver->setBuddy(mDlSaver); - connect( mDlSaver, TQT_SIGNAL( openFileDialog( KURLRequester * )), - this, TQT_SLOT( slotRequesterClicked( KURLRequester * ))); + connect( mDlSaver, TQ_SIGNAL( openFileDialog( KURLRequester * )), + this, TQ_SLOT( slotRequesterClicked( KURLRequester * ))); TQWhatsThis::add(mDlSaver, i18n("When opening a non-local file, download it to the selected folder.")); mPlayOnStartup = new TQButtonGroup(1,TQt::Horizontal, i18n("Play Behavior on Startup"), this); diff --git a/noatun/library/controls.cpp b/noatun/library/controls.cpp index fef7768f..7042cfbd 100644 --- a/noatun/library/controls.cpp +++ b/noatun/library/controls.cpp @@ -73,11 +73,11 @@ int 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/noatun/library/downloader.cpp b/noatun/library/downloader.cpp index b8081626..2c65f536 100644 --- a/noatun/library/downloader.cpp +++ b/noatun/library/downloader.cpp @@ -94,7 +94,7 @@ void Downloader::start() delete mUnstartedQueue; mUnstartedQueue=0; - TQTimer::singleShot(0, this, TQT_SLOT(getNext())); + TQTimer::singleShot(0, this, TQ_SLOT(getNext())); } static TQString nonExistantFile(const TQString &file) @@ -143,7 +143,7 @@ TQString Downloader::enqueue(DownloadItem *notifier, const KURL &file) } mQueue.append(i); - TQTimer::singleShot(0, this, TQT_SLOT(getNext())); + TQTimer::singleShot(0, this, TQ_SLOT(getNext())); emit enqueued(notifier, file); return i->local; } @@ -181,15 +181,15 @@ void Downloader::getNext() localfile->open(IO_ReadWrite | IO_Append); mJob= TDEIO::get(current->file, true, false); - connect(mJob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), TQT_SLOT(data(TDEIO::Job*, const TQByteArray&))); - connect(mJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(jobDone(TDEIO::Job*))); - connect(mJob, TQT_SIGNAL(percent(TDEIO::Job*, unsigned long)), TQT_SLOT(percent(TDEIO::Job*, unsigned long))); + connect(mJob, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), TQ_SLOT(data(TDEIO::Job*, const TQByteArray&))); + connect(mJob, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(jobDone(TDEIO::Job*))); + connect(mJob, TQ_SIGNAL(percent(TDEIO::Job*, unsigned long)), TQ_SLOT(percent(TDEIO::Job*, unsigned long))); if (mTimeout) delete mTimeout; mTimeout=new TQTimer(this); mTimeout->start(30000, true); - connect(mTimeout, TQT_SIGNAL(timeout()), TQT_SLOT(giveUpWithThisDownloadServerIsRunningNT())); + connect(mTimeout, TQ_SIGNAL(timeout()), TQ_SLOT(giveUpWithThisDownloadServerIsRunningNT())); } void Downloader::data(TDEIO::Job *, const TQByteArray &data) diff --git a/noatun/library/effectview.cpp b/noatun/library/effectview.cpp index 72391b8d..193d8adb 100644 --- a/noatun/library/effectview.cpp +++ b/noatun/library/effectview.cpp @@ -90,7 +90,7 @@ TQToolButton *newButton(const TQIconSet &iconSet, const TQString &textLabel, TQO TQToolButton *button = new TQToolButton(parent, name); button->setIconSet(iconSet); button->setTextLabel(textLabel, true); - TQObject::connect(button, TQT_SIGNAL(clicked()), receiver, slot); + TQObject::connect(button, TQ_SIGNAL(clicked()), receiver, slot); button->setFixedSize(TQSize(22, 22)); return button; } @@ -116,7 +116,7 @@ void EffectView::init(void) TQHBoxLayout *topTopLayout = new TQHBoxLayout(topTopFrame, 0, KDialog::spacingHint()); topTopLayout->setAutoAdd(true); available = new KComboBox(false, topTopFrame); - TQToolButton *add = newButton(BarIconSet("go-down", TDEIcon::SizeSmall), i18n("Add"), TQT_TQOBJECT(this), TQT_SLOT(addEffect()), topTopFrame); + TQToolButton *add = newButton(BarIconSet("go-down", TDEIcon::SizeSmall), i18n("Add"), this, TQ_SLOT(addEffect()), topTopFrame); // Active TQHGroupBox *bottomBox = new TQHGroupBox(i18n("Active Effects"), box); @@ -138,25 +138,25 @@ void EffectView::init(void) active->setItemsMovable(true); active->setSelectionMode(TQListView::Single); active->setDragEnabled(true); - connect(active, TQT_SIGNAL(dropped(TQDropEvent *, TQListViewItem *)), TQT_SLOT(activeDrop(TQDropEvent *, TQListViewItem *))); + connect(active, TQ_SIGNAL(dropped(TQDropEvent *, TQListViewItem *)), TQ_SLOT(activeDrop(TQDropEvent *, TQListViewItem *))); // when a new effect is added - connect(napp->effects(), TQT_SIGNAL(added(Effect *)), TQT_SLOT(added(Effect *))); - connect(napp->effects(), TQT_SIGNAL(removed(Effect *)), TQT_SLOT(removed(Effect *))); - connect(napp->effects(), TQT_SIGNAL(moved(Effect *)), TQT_SLOT(moved(Effect *))); + connect(napp->effects(), TQ_SIGNAL(added(Effect *)), TQ_SLOT(added(Effect *))); + connect(napp->effects(), TQ_SIGNAL(removed(Effect *)), TQ_SLOT(removed(Effect *))); + connect(napp->effects(), TQ_SIGNAL(moved(Effect *)), TQ_SLOT(moved(Effect *))); available->setCurrentItem(0); - connect(active, TQT_SIGNAL(currentChanged(TQListViewItem *)), TQT_SLOT(activeChanged(TQListViewItem *))); + connect(active, TQ_SIGNAL(currentChanged(TQListViewItem *)), TQ_SLOT(activeChanged(TQListViewItem *))); active->setCurrentItem(0); // the buttons TQFrame *bottomLeftFrame = new TQFrame(bottomBox); TQVBoxLayout *bottomLeftLayout = new TQVBoxLayout(bottomLeftFrame, 0, KDialog::spacingHint()); - up = newButton(BarIconSet("go-up", TDEIcon::SizeSmall), i18n("Up"), TQT_TQOBJECT(this), TQT_SLOT(moveUp()), bottomLeftFrame); - down = newButton(BarIconSet("go-down", TDEIcon::SizeSmall), i18n("Down"), TQT_TQOBJECT(this), TQT_SLOT(moveDown()), bottomLeftFrame); - configure = newButton(BarIconSet("configure", TDEIcon::SizeSmall), i18n("Configure"), TQT_TQOBJECT(this), TQT_SLOT(configureEffect()), bottomLeftFrame); - remove = newButton(BarIconSet("remove", TDEIcon::SizeSmall), i18n("Remove"), TQT_TQOBJECT(this), TQT_SLOT(removeEffect()), bottomLeftFrame); + up = newButton(BarIconSet("go-up", TDEIcon::SizeSmall), i18n("Up"), this, TQ_SLOT(moveUp()), bottomLeftFrame); + down = newButton(BarIconSet("go-down", TDEIcon::SizeSmall), i18n("Down"), this, TQ_SLOT(moveDown()), bottomLeftFrame); + configure = newButton(BarIconSet("configure", TDEIcon::SizeSmall), i18n("Configure"), this, TQ_SLOT(configureEffect()), bottomLeftFrame); + remove = newButton(BarIconSet("remove", TDEIcon::SizeSmall), i18n("Remove"), this, TQ_SLOT(removeEffect()), bottomLeftFrame); bottomLeftLayout->addWidget(up); bottomLeftLayout->addWidget(down); bottomLeftLayout->addWidget(configure); diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp index dbb4d978..fcf5d160 100644 --- a/noatun/library/engine.cpp +++ b/noatun/library/engine.cpp @@ -11,7 +11,7 @@ #include <tdemessagebox.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <kdebug.h> #include <tqfile.h> @@ -39,9 +39,7 @@ static Arts::PlayObject nullPO() { return Arts::PlayObject::null(); } #define HARDWARE_VOLUME -#if defined(__osf__) -#undef HARDWARE_VOLUME -#elif defined(__linux__) +#if defined(__linux__) #include <sys/soundcard.h> #elif defined(__FreeBSD__) #include <sys/soundcard.h> @@ -293,19 +291,19 @@ bool Engine::open(const PlaylistItem &file) d->pProxy = new TitleProxy::Proxy(KURL(file.property("stream_"))); d->playobj = factory.createPlayObject(d->pProxy->proxyUrl(), false); - connect(d->playobj, TQT_SIGNAL(destroyed()), this, TQT_SLOT(deleteProxy())); + connect(d->playobj, TQ_SIGNAL(destroyed()), this, TQ_SLOT(deleteProxy())); connect( - d->pProxy, TQT_SIGNAL( + d->pProxy, TQ_SIGNAL( metaData( const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &)), - this, TQT_SIGNAL( + this, TQ_SIGNAL( receivedStreamMeta(const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &)) ); - connect(d->pProxy, TQT_SIGNAL(proxyError()), this, TQT_SLOT(slotProxyError())); + connect(d->pProxy, TQ_SIGNAL(proxyError()), this, TQ_SLOT(slotProxyError())); } else { @@ -328,7 +326,7 @@ bool Engine::open(const PlaylistItem &file) } else { - connect( d->playobj, TQT_SIGNAL( playObjectCreated() ), this, TQT_SLOT( connectPlayObject() ) ); + connect( d->playobj, TQ_SIGNAL( playObjectCreated() ), this, TQ_SLOT( connectPlayObject() ) ); } if (mPlay) diff --git a/noatun/library/equalizer.cpp b/noatun/library/equalizer.cpp index 87255cb7..da85115d 100644 --- a/noatun/library/equalizer.cpp +++ b/noatun/library/equalizer.cpp @@ -10,7 +10,7 @@ #include <tdetempfile.h> #include <tqdom.h> #include <tdeio/netaccess.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqtextstream.h> #include <math.h> #include <tdeconfig.h> @@ -164,19 +164,19 @@ void Equalizer::init() mBands.append(new Band(4)); mBands.append(new Band(5)); - connect(VEQ, TQT_SIGNAL(changed()), TQT_SIGNAL(changed())); + connect(VEQ, TQ_SIGNAL(changed()), TQ_SIGNAL(changed())); - connect(VEQ, TQT_SIGNAL(created(VPreset)), TQT_SLOT(created(VPreset))); - connect(VEQ, TQT_SIGNAL(selected(VPreset)), TQT_SLOT(selected(VPreset))); - connect(VEQ, TQT_SIGNAL(renamed(VPreset)), TQT_SLOT(renamed(VPreset))); - connect(VEQ, TQT_SIGNAL(removed(VPreset)), TQT_SLOT(removed(VPreset))); + connect(VEQ, TQ_SIGNAL(created(VPreset)), TQ_SLOT(created(VPreset))); + connect(VEQ, TQ_SIGNAL(selected(VPreset)), TQ_SLOT(selected(VPreset))); + connect(VEQ, TQ_SIGNAL(renamed(VPreset)), TQ_SLOT(renamed(VPreset))); + connect(VEQ, TQ_SIGNAL(removed(VPreset)), TQ_SLOT(removed(VPreset))); - connect(VEQ, TQT_SIGNAL(enabled()), TQT_SIGNAL(enabled())); - connect(VEQ, TQT_SIGNAL(disabled()), TQT_SIGNAL(disabled())); - connect(VEQ, TQT_SIGNAL(enabled(bool)), TQT_SIGNAL(enabled(bool))); + connect(VEQ, TQ_SIGNAL(enabled()), TQ_SIGNAL(enabled())); + connect(VEQ, TQ_SIGNAL(disabled()), TQ_SIGNAL(disabled())); + connect(VEQ, TQ_SIGNAL(enabled(bool)), TQ_SIGNAL(enabled(bool))); - connect(VEQ, TQT_SIGNAL(preampChanged(int)), TQT_SIGNAL(preampChanged(int))); - connect(VEQ, TQT_SIGNAL(preampChanged(int)), TQT_SIGNAL(preampChanged(int))); + connect(VEQ, TQ_SIGNAL(preampChanged(int)), TQ_SIGNAL(preampChanged(int))); + connect(VEQ, TQ_SIGNAL(preampChanged(int)), TQ_SIGNAL(preampChanged(int))); } void Equalizer::created(VPreset preset) diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp index dd809257..e2e2f0c1 100644 --- a/noatun/library/equalizerview.cpp +++ b/noatun/library/equalizerview.cpp @@ -42,7 +42,7 @@ PresetList::PresetList(TQWidget *parent, const char *name) header()->hide(); // a try to set a sne minimum width. unfortuately the custom item // still doesn't draw all text with that minimum width - setMinimumWidth(kapp->fontMetrics().boundingRect(i18n("Custom")).width()+2*itemMargin()); + setMinimumWidth(tdeApp->fontMetrics().boundingRect(i18n("Custom")).width()+2*itemMargin()); } void PresetList::rename(TQListViewItem *item, int c) @@ -71,19 +71,19 @@ EqualizerLevel::EqualizerLevel(TQWidget *parent, VBand band) mSlider->setTickmarks(TQSlider::Left); mSlider->setTickInterval(25); layout->addWidget(mSlider); - connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed(int))); + connect(mSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed(int))); mLabel = new TQLabel("", this, "EqualizerLevel::mLabel"); mLabel->setAlignment(AlignHCenter | AlignVCenter); layout->addWidget(mLabel); setMinimumHeight(200); -// setMinimumWidth(kapp->fontMetrics().width("158kHz")); -// setMinimumWidth(kapp->fontMetrics().width("549kHz")); +// setMinimumWidth(tdeApp->fontMetrics().width("158kHz")); +// setMinimumWidth(tdeApp->fontMetrics().width("549kHz")); setBand(band); - connect(EQ, TQT_SIGNAL(modified()), TQT_SLOT(changed())); - connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed(int))); + connect(EQ, TQ_SIGNAL(modified()), TQ_SLOT(changed())); + connect(mSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed(int))); } void EqualizerLevel::setBand(VBand band) @@ -126,30 +126,30 @@ void EqualizerView::show() bandsLayout = new TQHBoxLayout(mWidget->bandsFrame, 0, KDialog::spacingHint(), "bandsLayout"); - connect(mWidget->preampSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(setPreamp(int))); - connect(EQ, TQT_SIGNAL(preampChanged(int)), - this, TQT_SLOT(changedPreamp(int))); + connect(mWidget->preampSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(setPreamp(int))); + connect(EQ, TQ_SIGNAL(preampChanged(int)), + this, TQ_SLOT(changedPreamp(int))); mWidget->bandCount->setRange(EQ->minBands(), EQ->maxBands()); - connect(mWidget->bandCount, TQT_SIGNAL(valueChanged(int)), - EQ, TQT_SLOT(setBands(int))); + connect(mWidget->bandCount, TQ_SIGNAL(valueChanged(int)), + EQ, TQ_SLOT(setBands(int))); TQVBoxLayout *l = new TQVBoxLayout(mWidget->presetFrame); mPresets = new PresetList(mWidget->presetFrame, "mPresets"); l->addWidget(mPresets); - connect(mWidget->removePresetButton, TQT_SIGNAL(clicked()), TQT_SLOT(remove())); - connect(mWidget->addPresetButton, TQT_SIGNAL(clicked()), TQT_SLOT(create())); - connect(mWidget->resetEqButton, TQT_SIGNAL(clicked()), TQT_SLOT(reset())); + connect(mWidget->removePresetButton, TQ_SIGNAL(clicked()), TQ_SLOT(remove())); + connect(mWidget->addPresetButton, TQ_SIGNAL(clicked()), TQ_SLOT(create())); + connect(mWidget->resetEqButton, TQ_SIGNAL(clicked()), TQ_SLOT(reset())); new TDEListViewItem(mPresets, i18n("Custom")); - connect(mPresets, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(select(TQListViewItem*))); + connect(mPresets, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(select(TQListViewItem*))); - connect(mPresets, TQT_SIGNAL(itemRenamed(TQListViewItem*)), - this, TQT_SLOT(rename(TQListViewItem*))); + connect(mPresets, TQ_SIGNAL(itemRenamed(TQListViewItem*)), + this, TQ_SLOT(rename(TQListViewItem*))); // populate the preset list TQValueList<VPreset> presets = EQ->presets(); @@ -159,20 +159,20 @@ void EqualizerView::show() created(*it); } - connect(EQ, TQT_SIGNAL(created(VPreset)), TQT_SLOT(created(VPreset))); - connect(EQ, TQT_SIGNAL(renamed(VPreset)), TQT_SLOT(renamed(VPreset))); - connect(EQ, TQT_SIGNAL(removed(VPreset)), TQT_SLOT(removed(VPreset))); + connect(EQ, TQ_SIGNAL(created(VPreset)), TQ_SLOT(created(VPreset))); + connect(EQ, TQ_SIGNAL(renamed(VPreset)), TQ_SLOT(renamed(VPreset))); + connect(EQ, TQ_SIGNAL(removed(VPreset)), TQ_SLOT(removed(VPreset))); mWidget->enabledCheckBox->setChecked(EQ->isEnabled()); - connect(mWidget->enabledCheckBox, TQT_SIGNAL(toggled(bool)), - EQ, TQT_SLOT(setEnabled(bool))); - connect(EQ, TQT_SIGNAL(enabled(bool)), - mWidget->enabledCheckBox, TQT_SLOT(setChecked(bool))); - - connect(EQ, TQT_SIGNAL(changed()), - this, TQT_SLOT(changedEq())); - connect(EQ, TQT_SIGNAL(changedBands()), - this, TQT_SLOT(changedBands())); + connect(mWidget->enabledCheckBox, TQ_SIGNAL(toggled(bool)), + EQ, TQ_SLOT(setEnabled(bool))); + connect(EQ, TQ_SIGNAL(enabled(bool)), + mWidget->enabledCheckBox, TQ_SLOT(setChecked(bool))); + + connect(EQ, TQ_SIGNAL(changed()), + this, TQ_SLOT(changedEq())); + connect(EQ, TQ_SIGNAL(changedBands()), + this, TQ_SLOT(changedBands())); changedBands(); changedEq(); diff --git a/noatun/library/noatun/app.h b/noatun/library/noatun/app.h index f8927376..ba6108fb 100644 --- a/noatun/library/noatun/app.h +++ b/noatun/library/noatun/app.h @@ -1,8 +1,8 @@ #ifndef NOATUN_H #define NOATUN_H -#include <kuniqueapplication.h> -#include <kdemacros.h> +#include <tdeuniqueapplication.h> +#include <tdemacros.h> class Playlist; class Player; class LibraryLoader; @@ -28,7 +28,7 @@ namespace NoatunStdAction * @author Charles Samuels * @version 2.3 */ -class KDE_EXPORT NoatunApp : public KUniqueApplication +class TDE_EXPORT NoatunApp : public TDEUniqueApplication { TQ_OBJECT @@ -258,7 +258,7 @@ private: bool showingInterfaces; }; -#define napp (static_cast<NoatunApp*>(kapp)) +#define napp (static_cast<NoatunApp*>(tdeApp)) // version info for the plugins // this is MAJOR.MINOR.PATCHLEVEL diff --git a/noatun/library/noatun/controls.h b/noatun/library/noatun/controls.h index 813be2ee..8648a514 100644 --- a/noatun/library/noatun/controls.h +++ b/noatun/library/noatun/controls.h @@ -7,7 +7,7 @@ #include <tdetoolbar.h> #include <tqslider.h> #include <tqstringlist.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQComboBox; class TQLabel; @@ -20,7 +20,7 @@ class TQLabel; * @author Charles Samuels * @version 2.3 **/ -class KDE_EXPORT L33tSlider : public TQSlider +class TDE_EXPORT L33tSlider : public TQSlider { TQ_OBJECT diff --git a/noatun/library/noatun/engine.h b/noatun/library/noatun/engine.h index e4dc1403..10b73293 100644 --- a/noatun/library/noatun/engine.h +++ b/noatun/library/noatun/engine.h @@ -5,7 +5,7 @@ #include <kurl.h> #include <arts/kmedia2.h> #include <noatun/playlist.h> -#include <kdemacros.h> +#include <tdemacros.h> class Visualization; namespace Arts @@ -30,7 +30,7 @@ class NoatunApp; * Does almost everything related to multimedia. * Most interfacing should be done with Player **/ -class KDE_EXPORT Engine : public TQObject +class TDE_EXPORT Engine : public TQObject { TQ_OBJECT diff --git a/noatun/library/noatun/player.h b/noatun/library/noatun/player.h index 3f3b3ae8..a5022269 100644 --- a/noatun/library/noatun/player.h +++ b/noatun/library/noatun/player.h @@ -5,7 +5,7 @@ #include <tqtimer.h> #include <kurl.h> #include <noatun/playlist.h> -#include <kdemacros.h> +#include <tdemacros.h> class Engine; class Playlist; class KLibrary; @@ -19,7 +19,7 @@ class KLibrary; * @author Charles Samuels * @version 2.4 **/ -class KDE_EXPORT Player : public TQObject +class TDE_EXPORT Player : public TQObject { TQ_OBJECT diff --git a/noatun/library/noatun/playlist.h b/noatun/library/noatun/playlist.h index a8188e3b..4a8ebeb4 100644 --- a/noatun/library/noatun/playlist.h +++ b/noatun/library/noatun/playlist.h @@ -6,7 +6,7 @@ #include <tqdict.h> #include <tqstringlist.h> #include <cassert> -#include <kdemacros.h> +#include <tdemacros.h> class PlaylistItem; @@ -27,7 +27,7 @@ class PlaylistItem; * @author Charles Samuels * @version 2.3 **/ -class KDE_EXPORT PlaylistItemData +class TDE_EXPORT PlaylistItemData { public: PlaylistItemData(); @@ -205,7 +205,7 @@ private: * @author Charles Samuels * @version 2.3 **/ -class KDE_EXPORT PlaylistItem +class TDE_EXPORT PlaylistItem { public: PlaylistItem(const PlaylistItem &source); diff --git a/noatun/library/noatun/plugin.h b/noatun/library/noatun/plugin.h index f01b0f27..e42ec136 100644 --- a/noatun/library/noatun/plugin.h +++ b/noatun/library/noatun/plugin.h @@ -4,7 +4,7 @@ #include <noatun/pluginloader.h> #include <tqmemarray.h> #include <vector> -#include <kdemacros.h> +#include <tdemacros.h> namespace Noatun { class FFTScopeStereo; class FFTScope; class RawScope; class RawScopeStereo; class StereoEffectStack; @@ -24,7 +24,7 @@ class NoatunApp; /** * @short Base class for all plugins **/ -class KDE_EXPORT Plugin +class TDE_EXPORT Plugin { public: Plugin(); @@ -58,7 +58,7 @@ public: * Inherit from this one instead of Plugin if you are * a user-interface **/ -class KDE_EXPORT UserInterface : public Plugin +class TDE_EXPORT UserInterface : public Plugin { public: UserInterface(); @@ -162,7 +162,7 @@ private: /** * Base class for all kinds of FFT scopes **/ -class KDE_EXPORT FFTScope : public Visualization +class TDE_EXPORT FFTScope : public Visualization { public: FFTScope(int interval, int pid=0); @@ -205,7 +205,7 @@ public: * An easy to use FFT scope, stereo version. * You certainly want to reimplement scopeEvent() **/ -class KDE_EXPORT StereoFFTScope : public FFTScope +class TDE_EXPORT StereoFFTScope : public FFTScope { public: StereoFFTScope(int timeout=250, int pid=0); @@ -242,7 +242,7 @@ private: * An easy to use FFT scope, mono version. * You certainly want to reimplement scopeEvent() **/ -class KDE_EXPORT MonoFFTScope : public FFTScope +class TDE_EXPORT MonoFFTScope : public FFTScope { public: MonoFFTScope(int timeout=250, int pid=0); @@ -302,7 +302,7 @@ public: * Note: Of course this one also works for audio with more than one channel * You certainly want to reimplement scopeEvent() */ -class KDE_EXPORT MonoScope : public Scope +class TDE_EXPORT MonoScope : public Scope { public: MonoScope(int timeout=250, int pid=0); diff --git a/noatun/library/noatun/pluginloader.h b/noatun/library/noatun/pluginloader.h index 04c1b750..d6059021 100644 --- a/noatun/library/noatun/pluginloader.h +++ b/noatun/library/noatun/pluginloader.h @@ -8,7 +8,7 @@ #include <klibloader.h> #include <tqdict.h> -#include <kdemacros.h> +#include <tdemacros.h> struct NoatunLibraryInfo { @@ -33,7 +33,7 @@ class Plugin; /** * Used for loading plugins at runtime **/ -class KDE_EXPORT LibraryLoader +class TDE_EXPORT LibraryLoader { friend class Plugin; struct PluginLibrary @@ -64,7 +64,7 @@ public: **/ bool remove(const TQString &spec); /** - * Same as the above, but does not call kapp->exit() even + * Same as the above, but does not call tdeApp->exit() even * when the last userinterface plugin is removed. Necessary * during session management (see marquis plugin). * ### BIC: merge with above with terminateOnLastUI = true diff --git a/noatun/library/noatun/pref.h b/noatun/library/noatun/pref.h index 4745a010..58780594 100644 --- a/noatun/library/noatun/pref.h +++ b/noatun/library/noatun/pref.h @@ -3,7 +3,7 @@ #include <kdialogbase.h> #include <tqptrlist.h> -#include <kdemacros.h> +#include <tdemacros.h> class CModule; @@ -54,7 +54,7 @@ private: * Create your GUI in constructor, reimplement reopen() and save() and * you're all set. **/ -class KDE_EXPORT CModule : public TQWidget +class TDE_EXPORT CModule : public TQWidget { TQ_OBJECT diff --git a/noatun/library/noatun/stdaction.h b/noatun/library/noatun/stdaction.h index 0ddf7f20..af3cec69 100644 --- a/noatun/library/noatun/stdaction.h +++ b/noatun/library/noatun/stdaction.h @@ -3,7 +3,7 @@ #include <tdeaction.h> #include <tdeactionclasses.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEPopupMenu; /** @@ -121,64 +121,64 @@ private: /** * @return pointer to a TDEAction which opens the effects dialog on activation */ -KDE_EXPORT TDEAction *effects(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *effects(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a TDEAction which opens the equalizer dialog on activation */ -KDE_EXPORT TDEAction *equalizer(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *equalizer(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a TDEAction which goes back one track on activation */ -KDE_EXPORT TDEAction *back(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *back(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a TDEAction which stops playback on activation */ -KDE_EXPORT TDEAction *stop(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *stop(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a TDEAction which starts/pauses playback on activation */ -KDE_EXPORT TDEAction *playpause(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *playpause(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a TDEAction which advances one track on activation */ -KDE_EXPORT TDEAction *forward(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *forward(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a TDEToggleAction which shows/hides the playlist */ -KDE_EXPORT TDEToggleAction *playlist(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEToggleAction *playlist(TQObject *parent = 0, const char *name = 0); /** * loop action **/ -KDE_EXPORT LoopActionMenu *loop(TQObject *parent, const char *name); +TDE_EXPORT LoopActionMenu *loop(TQObject *parent, const char *name); /** * play action */ -KDE_EXPORT TDEAction *play(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *play(TQObject *parent = 0, const char *name = 0); /** * pause action */ -KDE_EXPORT TDEAction *pause(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *pause(TQObject *parent = 0, const char *name = 0); /** * @return pointer to the global PluginActionMenu object (there is only one instance) */ -KDE_EXPORT PluginActionMenu *actions(); +TDE_EXPORT PluginActionMenu *actions(); /** * @return pointer to a VisActionMenu object */ -KDE_EXPORT VisActionMenu *visualizations(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT VisActionMenu *visualizations(TQObject *parent = 0, const char *name = 0); /** * The global popupmenu of noatun, there's not two or three but only one of these :) * @author Charles Samuels **/ -class KDE_EXPORT ContextMenu +class TDE_EXPORT ContextMenu { public: static TDEPopupMenu *createContextMenu(TQWidget *p); diff --git a/noatun/library/noatun/vequalizer.h b/noatun/library/noatun/vequalizer.h index 244fcd11..54599973 100644 --- a/noatun/library/noatun/vequalizer.h +++ b/noatun/library/noatun/vequalizer.h @@ -42,7 +42,7 @@ #include <tqptrlist.h> #include <tqobject.h> #include <kurl.h> -#include <kdemacros.h> +#include <tdemacros.h> class VBand; /** @@ -76,7 +76,7 @@ class VEqualizer; * Represents a single band in a vequalizer * @author Charles Samuels **/ -class KDE_EXPORT VBand +class TDE_EXPORT VBand { friend class VInterpolation; friend class VEqualizer; @@ -134,7 +134,7 @@ public: * @short interpolated representation of Eq data * @author Charles Samuels **/ -class KDE_EXPORT VInterpolation : public TQObject, public VBandsInterface +class TDE_EXPORT VInterpolation : public TQObject, public VBandsInterface { TQ_OBJECT @@ -174,7 +174,7 @@ class VPreset; * @short Noatun EQ * @author Charles Samuels **/ -class KDE_EXPORT VEqualizer : public TQObject, public VBandsInterface +class TDE_EXPORT VEqualizer : public TQObject, public VBandsInterface { TQ_OBJECT diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp index de05590c..f9e6f49f 100644 --- a/noatun/library/noatunstdaction.cpp +++ b/noatun/library/noatunstdaction.cpp @@ -22,11 +22,11 @@ namespace NoatunStdAction { ///////////////////////////////////////////////////// PlayAction::PlayAction(TQObject *parent, const char *name) - : TDEAction(i18n("Play"), 0, napp->player(), TQT_SLOT(playpause()), parent, name) + : TDEAction(i18n("Play"), 0, napp->player(), TQ_SLOT(playpause()), parent, name) { - connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(playing())); - connect(napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(notplaying())); - connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(notplaying())); + connect(napp->player(), TQ_SIGNAL(playing()), TQ_SLOT(playing())); + connect(napp->player(), TQ_SIGNAL(paused()), TQ_SLOT(notplaying())); + connect(napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(notplaying())); if (napp->player()->isPlaying()) playing(); else if (napp->player()->isPaused() || napp->player()->isStopped()) @@ -47,11 +47,11 @@ void PlayAction::notplaying() ///////////////////////////////////////////////////// PlaylistAction::PlaylistAction(TQObject *parent, const char *name) - : TDEToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQT_SLOT(toggleListView()), parent, name) + : TDEToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQ_SLOT(toggleListView()), parent, name) { setCheckedState(i18n("Hide Playlist")); - connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(shown())); - connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(hidden())); + connect(napp->player(), TQ_SIGNAL(playlistShown()), TQ_SLOT(shown())); + connect(napp->player(), TQ_SIGNAL(playlistHidden()), TQ_SLOT(hidden())); setChecked(napp->playlist()->listVisible()); } @@ -114,8 +114,8 @@ void PluginActionMenu::menuRemove(int id) VisActionMenu::VisActionMenu(TQObject *parent, const char *name) : TDEActionMenu(i18n("&Visualizations"), parent, name) { - connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(fillPopup())); - connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(toggleVisPlugin(int))); + connect(popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(fillPopup())); + connect(popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(toggleVisPlugin(int))); } void VisActionMenu::fillPopup() @@ -163,26 +163,26 @@ LoopActionMenu::LoopActionMenu(TQObject *parent, const char *name) : TDEActionMenu(i18n("&Loop"), parent, name) { mLoopNone = new TDERadioAction(i18n("&None"), TQString::fromLocal8Bit("noatunloopnone"), - 0, TQT_TQOBJECT(this), TQT_SLOT(loopNoneSelected()), TQT_TQOBJECT(this), "loop_none"); + 0, this, TQ_SLOT(loopNoneSelected()), this, "loop_none"); mLoopNone->setExclusiveGroup("loopType"); insert(mLoopNone); mLoopSong = new TDERadioAction(i18n("&Song"), TQString::fromLocal8Bit("noatunloopsong"), - 0, TQT_TQOBJECT(this), TQT_SLOT(loopSongSelected()), TQT_TQOBJECT(this), "loop_song"); + 0, this, TQ_SLOT(loopSongSelected()), this, "loop_song"); mLoopSong->setExclusiveGroup("loopType"); insert(mLoopSong); mLoopPlaylist = new TDERadioAction(i18n("&Playlist"), TQString::fromLocal8Bit("noatunloopplaylist"), - 0, TQT_TQOBJECT(this), TQT_SLOT(loopPlaylistSelected()), TQT_TQOBJECT(this), "loop_playlist"); + 0, this, TQ_SLOT(loopPlaylistSelected()), this, "loop_playlist"); mLoopPlaylist->setExclusiveGroup("loopType"); insert(mLoopPlaylist); mLoopRandom = new TDERadioAction(i18n("&Random"), TQString::fromLocal8Bit("noatunlooprandom"), - 0, TQT_TQOBJECT(this), TQT_SLOT(loopRandomSelected()), TQT_TQOBJECT(this), "loop_random"); + 0, this, TQ_SLOT(loopRandomSelected()), this, "loop_random"); mLoopRandom->setExclusiveGroup("loopType"); insert(mLoopRandom); - connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), TQT_TQOBJECT(this), TQT_SLOT(updateLooping(int))); + connect(napp->player(), TQ_SIGNAL(loopTypeChange(int)), this, TQ_SLOT(updateLooping(int))); updateLooping(static_cast<int>(napp->player()->loopStyle())); } @@ -239,25 +239,25 @@ TDEAction *playpause(TQObject *parent, const char *name) TDEAction *effects(TQObject *parent, const char *name) { - return new TDEAction(i18n("&Effects..."), "effect", 0, TQT_TQOBJECT(napp), TQT_SLOT(effectView()), parent, name); + return new TDEAction(i18n("&Effects..."), "effect", 0, napp, TQ_SLOT(effectView()), parent, name); } TDEAction *equalizer(TQObject *parent, const char *name) { - return new TDEAction(i18n("E&qualizer..."), "equalizer", 0, TQT_TQOBJECT(napp), TQT_SLOT(equalizerView()), parent, name); + return new TDEAction(i18n("E&qualizer..."), "equalizer", 0, napp, TQ_SLOT(equalizerView()), parent, name); } TDEAction *back(TQObject *parent, const char *name) { - return new TDEAction(i18n("&Back"), "media-skip-backward", 0, TQT_TQOBJECT(napp->player()), TQT_SLOT(back()), parent, name); + return new TDEAction(i18n("&Back"), "media-skip-backward", 0, napp->player(), TQ_SLOT(back()), parent, name); } TDEAction *stop(TQObject *parent, const char *name) { - StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "media-playback-stop", 0, napp->player(), TQT_SLOT(stop()), parent, name); - TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable())); - TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(enable())); - TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable())); + StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "media-playback-stop", 0, napp->player(), TQ_SLOT(stop()), parent, name); + TQObject::connect(napp->player(), TQ_SIGNAL(playing()), action, TQ_SLOT(enable())); + TQObject::connect(napp->player(), TQ_SIGNAL(paused()), action, TQ_SLOT(enable())); + TQObject::connect(napp->player(), TQ_SIGNAL(stopped()), action, TQ_SLOT(disable())); if(napp->player()->isStopped()) action->disable(); else @@ -267,15 +267,15 @@ TDEAction *stop(TQObject *parent, const char *name) TDEAction *forward(TQObject *parent, const char *name) { - return new TDEAction(i18n("&Forward"), "media-skip-forward", 0, napp->player(), TQT_SLOT(forward()), parent, name); + return new TDEAction(i18n("&Forward"), "media-skip-forward", 0, napp->player(), TQ_SLOT(forward()), parent, name); } TDEAction *play(TQObject *parent, const char *name) { - StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "media-playback-start", 0, napp->player(), TQT_SLOT(playpause()), parent, name); - TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(disable())); - TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(enable())); - TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(enable())); + StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "media-playback-start", 0, napp->player(), TQ_SLOT(playpause()), parent, name); + TQObject::connect(napp->player(), TQ_SIGNAL(playing()), action, TQ_SLOT(disable())); + TQObject::connect(napp->player(), TQ_SIGNAL(paused()), action, TQ_SLOT(enable())); + TQObject::connect(napp->player(), TQ_SIGNAL(stopped()), action, TQ_SLOT(enable())); if(napp->player()->isPlaying()) action->disable(); else @@ -285,10 +285,10 @@ TDEAction *play(TQObject *parent, const char *name) TDEAction *pause(TQObject *parent, const char *name) { - StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "media-playback-pause", 0, napp->player(), TQT_SLOT(playpause()), parent, name); - TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable())); - TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(disable())); - TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable())); + StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "media-playback-pause", 0, napp->player(), TQ_SLOT(playpause()), parent, name); + TQObject::connect(napp->player(), TQ_SIGNAL(playing()), action, TQ_SLOT(enable())); + TQObject::connect(napp->player(), TQ_SIGNAL(paused()), action, TQ_SLOT(disable())); + TQObject::connect(napp->player(), TQ_SIGNAL(stopped()), action, TQ_SLOT(disable())); if(napp->player()->isPlaying()) action->enable(); else @@ -330,18 +330,18 @@ TDEPopupMenu *ContextMenu::createContextMenu(TQWidget *p) { TDEPopupMenu *contextMenu = new TDEPopupMenu(p, "NoatunContextMenu"); - KHelpMenu *helpmenu = new KHelpMenu(contextMenu, kapp->aboutData(), false); + KHelpMenu *helpmenu = new KHelpMenu(contextMenu, tdeApp->aboutData(), false); TDEActionCollection* actions = new TDEActionCollection(helpmenu); - KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actions)->plug(contextMenu); - KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actions)->plug(contextMenu); + KStdAction::open(napp, TQ_SLOT(fileOpen()), actions)->plug(contextMenu); + KStdAction::quit(napp, TQ_SLOT(quit()), actions)->plug(contextMenu); contextMenu->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), helpmenu->menu()); contextMenu->insertSeparator(); - KStdAction::preferences(TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actions)->plug(contextMenu); - NoatunStdAction::playlist(TQT_TQOBJECT(contextMenu))->plug(contextMenu); - NoatunStdAction::effects(TQT_TQOBJECT(contextMenu))->plug(contextMenu); - NoatunStdAction::equalizer(TQT_TQOBJECT(napp))->plug(contextMenu); - NoatunStdAction::visualizations(TQT_TQOBJECT(napp))->plug(contextMenu); + KStdAction::preferences(napp, TQ_SLOT(preferences()), actions)->plug(contextMenu); + NoatunStdAction::playlist(contextMenu)->plug(contextMenu); + NoatunStdAction::effects(contextMenu)->plug(contextMenu); + NoatunStdAction::equalizer(napp)->plug(contextMenu); + NoatunStdAction::visualizations(napp)->plug(contextMenu); napp->pluginActionMenu()->plug(contextMenu); return contextMenu; diff --git a/noatun/library/noatuntags/tags.cpp b/noatun/library/noatuntags/tags.cpp index 7ac9e07f..62cd97bb 100644 --- a/noatun/library/noatuntags/tags.cpp +++ b/noatun/library/noatuntags/tags.cpp @@ -16,7 +16,7 @@ TagsGetter *Tags::getter=0; TagsGetter::TagsGetter() { new Control(this); - connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(newSong())); + connect(napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(newSong())); } int TagsGetter::interval() const @@ -115,7 +115,7 @@ void TagsGetter::associate(Tags *t) tags.append(t); sortPriority(); // getSongs(); - TQTimer::singleShot(interval(), this, TQT_SLOT(getSongs())); + TQTimer::singleShot(interval(), this, TQ_SLOT(getSongs())); } void TagsGetter::sortPriority() @@ -210,14 +210,14 @@ Control::Control(TagsGetter *parent) spin->setSuffix(i18n("Milliseconds", " ms")); - connect(slider, TQT_SIGNAL(valueChanged(int)), spin, TQT_SLOT(setValue(int))); - connect(spin, TQT_SIGNAL(valueChanged(int)), slider, TQT_SLOT(setValue(int))); + connect(slider, TQ_SIGNAL(valueChanged(int)), spin, TQ_SLOT(setValue(int))); + connect(spin, TQ_SIGNAL(valueChanged(int)), slider, TQ_SLOT(setValue(int))); slider->setValue(parent->interval()); - connect(slider, TQT_SIGNAL(valueChanged(int)), parent, TQT_SLOT(setInterval(int))); + connect(slider, TQ_SIGNAL(valueChanged(int)), parent, TQ_SLOT(setInterval(int))); - connect(onPlay, TQT_SIGNAL(toggled(bool)), intervalLine, TQT_SLOT(setEnabled(bool))); + connect(onPlay, TQ_SIGNAL(toggled(bool)), intervalLine, TQ_SLOT(setEnabled(bool))); } - connect(onPlay, TQT_SIGNAL(toggled(bool)), parent, TQT_SLOT(setLoadAuto(bool))); + connect(onPlay, TQ_SIGNAL(toggled(bool)), parent, TQ_SLOT(setLoadAuto(bool))); onPlay->setChecked(parent->loadAuto()); } diff --git a/noatun/library/player.cpp b/noatun/library/player.cpp index 5ab2aeba..bf1ecaed 100644 --- a/noatun/library/player.cpp +++ b/noatun/library/player.cpp @@ -18,18 +18,18 @@ Player::Player(TQObject *parent) : TQObject(parent, "Player"), position(-1), mLoopStyle(None), firstTimeout(true) { mEngine=new Engine; - connect(&filePos, TQT_SIGNAL(timeout()), TQT_SLOT(posTimeout())); - connect(mEngine, TQT_SIGNAL(aboutToPlay()), this, TQT_SLOT(aboutToPlay())); + connect(&filePos, TQ_SIGNAL(timeout()), TQ_SLOT(posTimeout())); + connect(mEngine, TQ_SIGNAL(aboutToPlay()), this, TQ_SLOT(aboutToPlay())); connect(mEngine, - TQT_SIGNAL(receivedStreamMeta(const TQString &, const TQString &, + TQ_SIGNAL(receivedStreamMeta(const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &)), - this, TQT_SLOT( + this, TQ_SLOT( slotUpdateStreamMeta(const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &)) ); - connect(mEngine, TQT_SIGNAL(playingFailed()), this, TQT_SLOT(forward())); + connect(mEngine, TQ_SIGNAL(playingFailed()), this, TQ_SLOT(forward())); handleButtons(); } diff --git a/noatun/library/playlist.cpp b/noatun/library/playlist.cpp index 7e59885f..380934bd 100644 --- a/noatun/library/playlist.cpp +++ b/noatun/library/playlist.cpp @@ -280,9 +280,9 @@ bool PlaylistItemData::operator != (const PlaylistItemData &d) const Playlist::Playlist(TQObject *parent, const char *name) : TQObject(parent, name) { - napp->player()->connect(this, TQT_SIGNAL(playCurrent()), TQT_SLOT(playCurrent())); - napp->player()->connect(this, TQT_SIGNAL(listHidden()), TQT_SIGNAL(playlistHidden())); - napp->player()->connect(this, TQT_SIGNAL(listShown()), TQT_SIGNAL(playlistShown())); + napp->player()->connect(this, TQ_SIGNAL(playCurrent()), TQ_SLOT(playCurrent())); + napp->player()->connect(this, TQ_SIGNAL(listHidden()), TQ_SIGNAL(playlistHidden())); + napp->player()->connect(this, TQ_SIGNAL(listShown()), TQ_SIGNAL(playlistShown())); } diff --git a/noatun/library/playlistsaver.cpp b/noatun/library/playlistsaver.cpp index 13b7ecfe..418c2a42 100644 --- a/noatun/library/playlistsaver.cpp +++ b/noatun/library/playlistsaver.cpp @@ -5,7 +5,7 @@ #include <tqtextstream.h> #include <noatun/app.h> #include "ksaver.h" -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kmimetype.h> #include <tdelocale.h> #include <tqregexp.h> @@ -449,7 +449,7 @@ bool PlaylistSaver::loadXML(const KURL &url, int opt) reset(); // TQXml is horribly documented - TQXmlInputSource source(TQT_TQIODEVICE(&file)); + TQXmlInputSource source(&file); TQXmlSimpleReader reader; if (opt == ASX || @@ -485,7 +485,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) // if it's a PLS, transfer control, again (TDEIO bug?) #if 0 { - KSimpleConfig list(local, true); + TDESimpleConfig list(local, true); list.setGroup("playlist"); // some stupid Windows lusers like to be case insensitive @@ -712,7 +712,7 @@ bool PlaylistSaver::loadPLS(const KURL &file, int /*opt*/) } - KSimpleConfig list(localFile, true); + TDESimpleConfig list(localFile, true); //list.setGroup("playlist"); // some stupid Windows lusers like to be case insensitive diff --git a/noatun/library/plugin.cpp b/noatun/library/plugin.cpp index 3c5b6f5d..63eb6464 100644 --- a/noatun/library/plugin.cpp +++ b/noatun/library/plugin.cpp @@ -8,7 +8,7 @@ #include <dcopclient.h> #include <dispatcher.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <cmath> @@ -566,7 +566,7 @@ ExitNotifier::~ExitNotifier() BoolNotifier::BoolNotifier(bool *value, NoatunListener *listener, TQObject *parent) : TQObject(parent) { - connect(listener, TQT_SIGNAL(event()), TQT_SLOT(event())); + connect(listener, TQ_SIGNAL(event()), TQ_SLOT(event())); mValue=value; } diff --git a/noatun/library/pluginloader.cpp b/noatun/library/pluginloader.cpp index 2fecb898..bc1cc2ff 100644 --- a/noatun/library/pluginloader.cpp +++ b/noatun/library/pluginloader.cpp @@ -1,8 +1,8 @@ #include <tqfile.h> #include <tdeglobal.h> #include <tqdir.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <knotifyclient.h> #include <tdelocale.h> #include <kurl.h> @@ -138,7 +138,7 @@ NoatunLibraryInfo LibraryLoader::getInfo(const TQString &spec) const TQString specPath = (spec[0]=='/') ? spec : TDEGlobal::dirs()->findResource("appdata", spec); if (!TQFile::exists(specPath)) return info; - KSimpleConfig file(specPath); + TDESimpleConfig file(specPath); if (spec.find('/')>=0) info.specfile=KURL(spec).fileName(); else @@ -262,7 +262,7 @@ bool LibraryLoader::remove(const TQString& spec, bool terminateOnLastUI) else { // No other UIs, terminate - kapp->exit(); + tdeApp->exit(); } } else if (info.type=="playlist") diff --git a/noatun/library/pluginmodule.cpp b/noatun/library/pluginmodule.cpp index d6b86e86..a7a59b48 100644 --- a/noatun/library/pluginmodule.cpp +++ b/noatun/library/pluginmodule.cpp @@ -152,7 +152,7 @@ Plugins::Plugins(TQObject *_parent) interfaceList->addColumn(i18n("Description")); interfaceList->addColumn(i18n("Author")); interfaceList->addColumn(i18n("License")); - connect(interfaceList, TQT_SIGNAL(stateChange(PluginListItem *, bool)), this, TQT_SLOT(stateChange(PluginListItem *, bool))); + connect(interfaceList, TQ_SIGNAL(stateChange(PluginListItem *, bool)), this, TQ_SLOT(stateChange(PluginListItem *, bool))); tabControl->addTab(interfaceTab, i18n("&Interfaces")); TQFrame *playlistTab = new TQFrame(tabControl); @@ -164,7 +164,7 @@ Plugins::Plugins(TQObject *_parent) playlistList->addColumn(i18n("Description")); playlistList->addColumn(i18n("Author")); playlistList->addColumn(i18n("License")); - connect(playlistList, TQT_SIGNAL(stateChange(PluginListItem *, bool)), this, TQT_SLOT(stateChange(PluginListItem *, bool))); + connect(playlistList, TQ_SIGNAL(stateChange(PluginListItem *, bool)), this, TQ_SLOT(stateChange(PluginListItem *, bool))); tabControl->addTab(playlistTab, i18n("&Playlist")); TQFrame *visTab = new TQFrame(tabControl); @@ -175,7 +175,7 @@ Plugins::Plugins(TQObject *_parent) visList->addColumn(i18n("Description")); visList->addColumn(i18n("Author")); visList->addColumn(i18n("License")); - connect(visList, TQT_SIGNAL(stateChange(PluginListItem *, bool)), this, TQT_SLOT(stateChange(PluginListItem *, bool))); + connect(visList, TQ_SIGNAL(stateChange(PluginListItem *, bool)), this, TQ_SLOT(stateChange(PluginListItem *, bool))); tabControl->addTab(visTab, i18n("&Visualizations")); // Other plugins are not restricted @@ -187,7 +187,7 @@ Plugins::Plugins(TQObject *_parent) otherList->addColumn(i18n("Description")); otherList->addColumn(i18n("Author")); otherList->addColumn(i18n("License")); - connect(otherList, TQT_SIGNAL(stateChange(PluginListItem *, bool)), this, TQT_SLOT(stateChange(PluginListItem *, bool))); + connect(otherList, TQ_SIGNAL(stateChange(PluginListItem *, bool)), this, TQ_SLOT(stateChange(PluginListItem *, bool))); tabControl->addTab(otherTab, i18n("O&ther Plugins")); } diff --git a/noatun/library/pref.cpp b/noatun/library/pref.cpp index 9ed882c5..55926830 100644 --- a/noatun/library/pref.cpp +++ b/noatun/library/pref.cpp @@ -32,7 +32,7 @@ void NoatunPreferences::show() void NoatunPreferences::show(CModule *page) { - int index = pageIndex( static_cast<TQWidget *>(TQT_TQWIDGET(page->parent())) ); + int index = pageIndex( static_cast<TQWidget *>(page->parent()) ); if (index != -1) showPage(index); show(); @@ -59,13 +59,13 @@ CModule::CModule(const TQString &name, const TQString &description, const TQStri icon, TDEIcon::Small,0, TDEIcon::DefaultState,0, true))) { if (owner) - connect(owner, TQT_SIGNAL(destroyed()), TQT_SLOT(ownerDeleted())); + connect(owner, TQ_SIGNAL(destroyed()), TQ_SLOT(ownerDeleted())); //kdDebug(66666) << k_funcinfo << "name = " << name << endl; napp->preferencesBox()->add(this); - TQFrame *page=static_cast<TQFrame*>(TQT_TQWIDGET(parent())); + TQFrame *page=static_cast<TQFrame*>(parent()); (new TQHBoxLayout(page))->addWidget(this); } diff --git a/noatun/library/scrollinglabel.cpp b/noatun/library/scrollinglabel.cpp index d21a2aad..235d10b3 100644 --- a/noatun/library/scrollinglabel.cpp +++ b/noatun/library/scrollinglabel.cpp @@ -62,8 +62,8 @@ ScrollingLabel::ScrollingLabel { d = new Private; - connect(&d->scrollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(scroll())); - connect(&d->resetTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(restoreText())); + connect(&d->scrollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(scroll())); + connect(&d->resetTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(restoreText())); setText(initialText); } diff --git a/noatun/library/titleproxy.cpp b/noatun/library/titleproxy.cpp index 65006135..a4439207 100644 --- a/noatun/library/titleproxy.cpp +++ b/noatun/library/titleproxy.cpp @@ -50,9 +50,9 @@ Proxy::Proxy( KURL url ) if ( m_url.port() < 1 ) m_url.setPort( 80 ); - connect( &m_sockRemote, TQT_SIGNAL( error( int ) ), this, TQT_SLOT( connectError() ) ); - connect( &m_sockRemote, TQT_SIGNAL( connected() ), this, TQT_SLOT( sendRequest() ) ); - connect( &m_sockRemote, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( readRemote() ) ); + connect( &m_sockRemote, TQ_SIGNAL( error( int ) ), this, TQ_SLOT( connectError() ) ); + connect( &m_sockRemote, TQ_SIGNAL( connected() ), this, TQ_SLOT( sendRequest() ) ); + connect( &m_sockRemote, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( readRemote() ) ); uint i = 0; Server* server = 0; @@ -74,7 +74,7 @@ Proxy::Proxy( KURL url ) return; } m_usedPort = i; - connect( server, TQT_SIGNAL( connected( int ) ), this, TQT_SLOT( accept( int ) ) ); + connect( server, TQ_SIGNAL( connected( int ) ), this, TQ_SLOT( accept( int ) ) ); } @@ -130,7 +130,7 @@ void Proxy::connectToHost() //SLOT { //connect to server TQTimer::singleShot( KProtocolManager::connectTimeout() * 1000, - this, TQT_SLOT( connectError() ) ); + this, TQ_SLOT( connectError() ) ); kdDebug(66666) << k_funcinfo << "Connecting to " << m_url.host() << ":" << m_url.port() << endl; @@ -316,8 +316,8 @@ bool Proxy::processHeader( TQ_LONG &index, TQ_LONG bytesRead ) return false; } - connect( &m_sockRemote, TQT_SIGNAL( connectionClosed() ), - this, TQT_SLOT( connectError() ) ); + connect( &m_sockRemote, TQ_SIGNAL( connectionClosed() ), + this, TQ_SLOT( connectError() ) ); return true; } } diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp index b8f46fa5..8b23322b 100644 --- a/noatun/library/vequalizer.cpp +++ b/noatun/library/vequalizer.cpp @@ -52,7 +52,7 @@ #include <tdetempfile.h> #include <tdeio/netaccess.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdelocale.h> @@ -315,7 +315,7 @@ VEqualizer::VEqualizer() void VEqualizer::init() { KURL url; - url.setPath(kapp->dirs()->localtdedir()+"/share/apps/noatun/equalizer"); + url.setPath(tdeApp->dirs()->localtdedir()+"/share/apps/noatun/equalizer"); if(!load(url)) { setPreamp(0); @@ -323,7 +323,7 @@ void VEqualizer::init() } else { - TDEConfig *config=kapp->config(); + TDEConfig *config=tdeApp->config(); config->setGroup("Equalizer"); setEnabled(config->readBoolEntry("enabled", false)); } @@ -333,7 +333,7 @@ void VEqualizer::init() VEqualizer::~VEqualizer() { KURL url; - url.setPath(kapp->dirs()->localtdedir()+"/share/apps/noatun/equalizer"); + url.setPath(tdeApp->dirs()->localtdedir()+"/share/apps/noatun/equalizer"); save(url, "auto"); delete d; @@ -535,7 +535,7 @@ void VEqualizer::setEnabled(bool e) { update(true); // just in case EQBACK->enabled((long)e); - TDEConfig *config=kapp->config(); + TDEConfig *config=tdeApp->config(); config->setGroup("Equalizer"); config->writeEntry("enabled", e); config->sync(); @@ -664,7 +664,7 @@ bool VEqualizer::fromString(const TQString &str) static TQString makePresetFile() { - TQString basedir=kapp->dirs()->localtdedir()+"/share/apps/noatun/eq.preset/"; + TQString basedir=tdeApp->dirs()->localtdedir()+"/share/apps/noatun/eq.preset/"; // now append a filename that doesn't exist TDEStandardDirs::makeDir(basedir); TQString fullpath; @@ -698,7 +698,7 @@ VPreset VEqualizer::createPreset(const TQString &name, bool smart) preset.setName(nameReal); save(preset.file(), nameReal); - TDEConfig *config=kapp->config(); + TDEConfig *config=tdeApp->config(); config->setGroup("Equalizer"); TQStringList list = config->readListEntry("presets"); list += preset.file(); @@ -722,7 +722,7 @@ TQValueList<VPreset> VEqualizer::presets() const } else { - list=kapp->dirs()->findAllResources("data", "noatun/eq.preset/*"); + list=tdeApp->dirs()->findAllResources("data", "noatun/eq.preset/*"); conf->writeEntry("presets", list); conf->sync(); } @@ -763,7 +763,7 @@ VPreset VEqualizer::presetByFile(const TQString &file) { TDEConfig *conf=TDEGlobal::config(); conf->setGroup("Equalizer"); - TQStringList list=kapp->config()->readListEntry("presets"); + TQStringList list=tdeApp->config()->readListEntry("presets"); if (list.contains(file)) return VPreset(file); return VPreset(); @@ -911,7 +911,7 @@ TQString VPreset::file() const void VPreset::remove() { - TDEConfig *config=kapp->config(); + TDEConfig *config=tdeApp->config(); config->setGroup("Equalizer"); TQStringList items=config->readListEntry("presets"); items.remove(file()); @@ -920,7 +920,7 @@ void VPreset::remove() emit EQ->removed(*this); - if (file().find(kapp->dirs()->localtdedir())==0) + if (file().find(tdeApp->dirs()->localtdedir())==0) { TQFile f(file()); f.remove(); diff --git a/noatun/library/video.cpp b/noatun/library/video.cpp index 0fceeb2d..8105127d 100644 --- a/noatun/library/video.cpp +++ b/noatun/library/video.cpp @@ -28,8 +28,8 @@ VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent, const char : KVideoWidget(clientParent, parent, name, f) { d = new Private; - connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed())); - connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(stopped())); + connect(napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(changed())); + connect(napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(stopped())); frames.append(this); } @@ -37,8 +37,8 @@ VideoFrame::VideoFrame(TQWidget *parent, const char *name, WFlags f) : KVideoWidget(parent, name, f) { d = new Private; - connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed())); - connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(stopped())); + connect(napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(changed())); + connect(napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(stopped())); frames.append(this); } @@ -126,9 +126,9 @@ GlobalVideo::GlobalVideo() // video->setMinimumSize(101,35); video->setMinimumSize(128,96); - connect(video, TQT_SIGNAL(acquired()), TQT_SLOT(appear())); - connect(video, TQT_SIGNAL(lost()), TQT_SLOT(hide())); - connect(video, TQT_SIGNAL(adaptSize(int,int)), this, TQT_SLOT(slotAdaptSize(int,int))); + connect(video, TQ_SIGNAL(acquired()), TQ_SLOT(appear())); + connect(video, TQ_SIGNAL(lost()), TQ_SLOT(hide())); + connect(video, TQ_SIGNAL(adaptSize(int,int)), this, TQ_SLOT(slotAdaptSize(int,int))); video->setNormalSize(); video->give(); diff --git a/noatun/modules/dcopiface/dcopiface.cpp b/noatun/modules/dcopiface/dcopiface.cpp index aef6c58f..0a146f94 100644 --- a/noatun/modules/dcopiface/dcopiface.cpp +++ b/noatun/modules/dcopiface/dcopiface.cpp @@ -9,7 +9,7 @@ extern "C" { - KDE_EXPORT NIF *create_plugin() + TDE_EXPORT NIF *create_plugin() { return new NIF(); } @@ -19,12 +19,12 @@ extern "C" NIF::NIF() : Plugin(), DCOPObject("Noatun") { mLastVolume = 0; -// connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(newSongPlaying())); +// connect(napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(newSongPlaying())); } NIF::~NIF() { - kapp->dcopClient()->emitDCOPSignal("exiting()", TQByteArray()); + tdeApp->dcopClient()->emitDCOPSignal("exiting()", TQByteArray()); } void NIF::toggleListView() @@ -241,7 +241,7 @@ TQCString NIF::version() void NIF::newSongPlaying() { - kapp->dcopClient()->emitDCOPSignal("newFile()", TQByteArray()); + tdeApp->dcopClient()->emitDCOPSignal("newFile()", TQByteArray()); } void NIF::clear() diff --git a/noatun/modules/dcopiface/dcopiface.h b/noatun/modules/dcopiface/dcopiface.h index cd58a228..05afd019 100644 --- a/noatun/modules/dcopiface/dcopiface.h +++ b/noatun/modules/dcopiface/dcopiface.h @@ -5,9 +5,9 @@ #include <noatun/plugin.h> #include <dcopobject.h> -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT NIF : public Plugin, public DCOPObject +class TDE_EXPORT NIF : public Plugin, public DCOPObject { K_DCOP diff --git a/noatun/modules/excellent/noatunui.cpp b/noatun/modules/excellent/noatunui.cpp index a103268d..575dc32a 100644 --- a/noatun/modules/excellent/noatunui.cpp +++ b/noatun/modules/excellent/noatunui.cpp @@ -26,7 +26,7 @@ #include "userinterface.h" -extern "C" KDE_EXPORT Plugin *create_plugin() +extern "C" TDE_EXPORT Plugin *create_plugin() { return new Excellent(); } diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp index 540a3abc..b03a2dbc 100644 --- a/noatun/modules/excellent/userinterface.cpp +++ b/noatun/modules/excellent/userinterface.cpp @@ -67,12 +67,12 @@ Excellent::Excellent() { setAcceptDrops(true); - KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection()); - KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(napp, TQ_SLOT(quit()), actionCollection()); + KStdAction::open(napp, TQ_SLOT(fileOpen()), actionCollection()); setStandardToolBarMenuEnabled(true); - menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection()); + menubarAction = KStdAction::showMenubar(this, TQ_SLOT(showMenubar()), actionCollection()); + KStdAction::preferences(napp, TQ_SLOT(preferences()), actionCollection()); // buttons NoatunStdAction::back(actionCollection(), "back"); @@ -82,7 +82,7 @@ Excellent::Excellent() NoatunStdAction::forward(actionCollection(), "forward"); NoatunStdAction::playlist(actionCollection(), "show_playlist"); - volumeAction = new TDEToggleAction(i18n("Show &Volume Control"), 0, TQT_TQOBJECT(this), TQT_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol"); + volumeAction = new TDEToggleAction(i18n("Show &Volume Control"), 0, this, TQ_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol"); volumeAction->setCheckedState(i18n("Hide &Volume Control")); NoatunStdAction::effects(actionCollection(), "effects"); NoatunStdAction::equalizer(actionCollection(), "equalizer"); @@ -129,24 +129,24 @@ Excellent::Excellent() statusBar()->addWidget(total, 0, true); statusBar()->show(); - connect( napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) ); - connect( napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) ); + connect( napp, TQ_SIGNAL(hideYourself()), this, TQ_SLOT(hide()) ); + connect( napp, TQ_SIGNAL(showYourself()), this, TQ_SLOT(show()) ); - connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlaying())); - connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped())); - connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPaused())); + connect(napp->player(), TQ_SIGNAL(playing()), this, TQ_SLOT(slotPlaying())); + connect(napp->player(), TQ_SIGNAL(stopped()), this, TQ_SLOT(slotStopped())); + connect(napp->player(), TQ_SIGNAL(paused()), this, TQ_SLOT(slotPaused())); napp->player()->handleButtons(); - connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); - connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(slotLoopTypeChanged(int))); + connect(napp->player(), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); + connect(napp->player(), TQ_SIGNAL(loopTypeChange(int)), this, TQ_SLOT(slotLoopTypeChanged(int))); /* This skipToWrapper is needed to pass milliseconds to Player() as everybody * below the GUI is based on milliseconds instead of some unprecise thingy * like seconds or mille */ - connect(slider, TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int))); - connect(this, TQT_SIGNAL(skipTo(int)), napp->player(), TQT_SLOT(skipTo(int))); + connect(slider, TQ_SIGNAL(userChanged(int)), this, TQ_SLOT(skipToWrapper(int))); + connect(this, TQ_SIGNAL(skipTo(int)), napp->player(), TQ_SLOT(skipTo(int))); - connect(slider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(sliderMoved(int))); + connect(slider, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(sliderMoved(int))); setCaption("Noatun"); setIcon(SmallIcon("noatun")); @@ -376,8 +376,8 @@ void Excellent::growVolumeControl(void) volumeSlider = new L33tSlider(0, 100, 10, 0,TQt::Vertical, mainFrame); volumeSlider->setValue(100 - napp->player()->volume()); volumeSlider->show(); - connect(volumeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(changeVolume(int))); - connect(volumeSlider, TQT_SIGNAL(userChanged(int)), TQT_SLOT(changeVolume(int))); + connect(volumeSlider, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(changeVolume(int))); + connect(volumeSlider, TQ_SIGNAL(userChanged(int)), TQ_SLOT(changeVolume(int))); } void Excellent::shrinkVolumeControl(void) diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp index bc2399cc..3facc98c 100644 --- a/noatun/modules/htmlexport/htmlexport.cpp +++ b/noatun/modules/htmlexport/htmlexport.cpp @@ -7,7 +7,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new HTMLExport(); } @@ -18,7 +18,7 @@ HTMLExport::HTMLExport(): TQObject(0, "HTMLExport"), Plugin() NOATUNPLUGINC(HTMLExport); mAction = new TDEAction(i18n("&Export Playlist..."), "document-save-as", 0, - this, TQT_SLOT(slotExport()), this, "exportlist"); + this, TQ_SLOT(slotExport()), this, "exportlist"); napp->pluginActionMenu()->insert(mAction); new Prefs(this); diff --git a/noatun/modules/infrared/infrared.cpp b/noatun/modules/infrared/infrared.cpp index bd8a65bd..76b6dc73 100644 --- a/noatun/modules/infrared/infrared.cpp +++ b/noatun/modules/infrared/infrared.cpp @@ -14,7 +14,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new InfraRed(); } @@ -28,12 +28,12 @@ InfraRed::InfraRed() NOATUNPLUGINC(InfraRed); m_lirc = new Lirc(this); connect(m_lirc, - TQT_SIGNAL(commandReceived(const TQString &, const TQString &, int)), - TQT_SLOT(slotCommand(const TQString &, const TQString &, int))); + TQ_SIGNAL(commandReceived(const TQString &, const TQString &, int)), + TQ_SLOT(slotCommand(const TQString &, const TQString &, int))); IRPrefs::s_lirc = m_lirc; volume=0; - TQTimer::singleShot(0, this, TQT_SLOT(start())); + TQTimer::singleShot(0, this, TQ_SLOT(start())); } InfraRed::~InfraRed() diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp index 06a1ade4..829f51aa 100644 --- a/noatun/modules/infrared/irprefs.cpp +++ b/noatun/modules/infrared/irprefs.cpp @@ -84,26 +84,26 @@ IRPrefs::IRPrefs(TQObject *parent) m_interval->setEnabled(false); layout->addWidget(m_interval, 2, 4); - connect(s_lirc, TQT_SIGNAL(remotesRead()), TQT_SLOT(reopen())); + connect(s_lirc, TQ_SIGNAL(remotesRead()), TQ_SLOT(reopen())); connect(m_commands, - TQT_SIGNAL(selectionChanged(TQListViewItem *)), - TQT_SLOT(slotCommandSelected(TQListViewItem *))); + TQ_SIGNAL(selectionChanged(TQListViewItem *)), + TQ_SLOT(slotCommandSelected(TQListViewItem *))); connect(m_action, - TQT_SIGNAL(activated(int)), - TQT_SLOT(slotActionActivated(int))); + TQ_SIGNAL(activated(int)), + TQ_SLOT(slotActionActivated(int))); connect(m_repeat, - TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotRepeatToggled(bool))); + TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotRepeatToggled(bool))); connect(m_interval, - TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotIntervalChanged(int))); + TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotIntervalChanged(int))); reopen(); } void IRPrefs::save() { - TDEConfig *c = kapp->config(); + TDEConfig *c = tdeApp->config(); TDEConfigGroupSaver groupSaver(c, "Infrared"); c->writeEntry("CommandCount", s_commands.count()); int i = 1; @@ -282,7 +282,7 @@ void IRPrefs::readConfig() { if (s_configRead) return; - TDEConfig *c = kapp->config(); + TDEConfig *c = tdeApp->config(); TDEConfigGroupSaver groupSaver(c, "Infrared"); int count = c->readNumEntry("CommandCount"); for (int i = 1; i <= count; ++i) diff --git a/noatun/modules/infrared/lirc.cpp b/noatun/modules/infrared/lirc.cpp index 2487278b..2a6e2ec5 100644 --- a/noatun/modules/infrared/lirc.cpp +++ b/noatun/modules/infrared/lirc.cpp @@ -34,7 +34,7 @@ Lirc::Lirc(TQObject *parent) m_socket = new TQSocket; m_socket->setSocket(sock); - connect(m_socket, TQT_SIGNAL(readyRead()), TQT_SLOT(slotRead())); + connect(m_socket, TQ_SIGNAL(readyRead()), TQ_SLOT(slotRead())); update(); } diff --git a/noatun/modules/kaiman/SKIN-SPECS b/noatun/modules/kaiman/SKIN-SPECS index ae293014..bc3533ad 100644 --- a/noatun/modules/kaiman/SKIN-SPECS +++ b/noatun/modules/kaiman/SKIN-SPECS @@ -247,7 +247,7 @@ Digit_Large/Digit_Small_Default: filename Image file. Contains digits horizontally from 0 to 9, and a blank space. These two digits are a convenience function, if you want to use a digit more than - once it is quicker to load it into on of these two Q_SLOTS. Then when using the digit + once it is quicker to load it into on of these two slots. Then when using the digit in the number item type below, use the words 'Large' or 'Small' in place of the filename. diff --git a/noatun/modules/kaiman/noatunui.cpp b/noatun/modules/kaiman/noatunui.cpp index bc1bceb0..6dc2538e 100644 --- a/noatun/modules/kaiman/noatunui.cpp +++ b/noatun/modules/kaiman/noatunui.cpp @@ -2,7 +2,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new Kaiman(); } diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp index 5e2193c7..3464e66f 100644 --- a/noatun/modules/kaiman/pref.cpp +++ b/noatun/modules/kaiman/pref.cpp @@ -24,7 +24,7 @@ #include <tqfileinfo.h> #include <tdeglobal.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include "pref.h" diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp index 1e4da725..ca96c933 100644 --- a/noatun/modules/kaiman/style.cpp +++ b/noatun/modules/kaiman/style.cpp @@ -19,7 +19,7 @@ #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tqfile.h> #include <tqtextstream.h> @@ -160,7 +160,7 @@ void KaimanStyleElement::setPixmap( int num ) if ( num<0 ) num = 0; _currentPixmap = num; - repaint( FALSE ); + repaint( false ); } } @@ -646,7 +646,7 @@ KaimanStyleText::KaimanStyleText(TQWidget *parent, const char *name) _pos = 0; _timer = new TQTimer( this ); _delay = 500; - connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()) ); + connect( _timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()) ); } KaimanStyleText::~KaimanStyleText() @@ -677,7 +677,7 @@ void KaimanStyleText::startAnimation( int delay ) _pos = 0; _direction = 1; _delay = delay; - _timer->start( _delay, TRUE ); + _timer->start( _delay, true ); } @@ -693,7 +693,7 @@ void KaimanStyleText::timeout() // reflect if ( _pos+_direction<0 || (int)_value.length()-(_pos+_direction)<digits ) { _direction = -_direction; - _timer->start( _delay*5, TRUE ); + _timer->start( _delay*5, true ); } else { // check new position if ( _pos+_direction>=0 && (int)_value.length()-(_pos+_direction)>=digits ) { @@ -701,7 +701,7 @@ void KaimanStyleText::timeout() repaint(); } - _timer->start( _delay, TRUE ); + _timer->start( _delay, true ); } @@ -741,7 +741,7 @@ KaimanStyleAnimation::KaimanStyleAnimation(int delay, TQWidget *parent, const ch _delay = delay; _frame = 0; _timer = new TQTimer( this ); - connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()) ); + connect( _timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()) ); } KaimanStyleAnimation::~KaimanStyleAnimation() @@ -750,7 +750,7 @@ KaimanStyleAnimation::~KaimanStyleAnimation() void KaimanStyleAnimation::start() { - _timer->start( _delay, FALSE ); + _timer->start( _delay, false ); } void KaimanStyleAnimation::pause() @@ -1405,8 +1405,8 @@ bool KaimanStyle::eventFilter( TQObject *o, TQEvent *e ) return true; } - TQPoint mousePos( m->x()+TQT_TQWIDGET(o)->x(), - m->y()+TQT_TQWIDGET(o)->y() ); + TQPoint mousePos( m->x()+static_cast<TQWidget*>(o)->x(), + m->y()+static_cast<TQWidget*>(o)->y() ); TQWidget *slider = 0; /* find slider that is under the mouse position */ diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp index 9f502178..dfcc15ab 100644 --- a/noatun/modules/kaiman/userinterface.cpp +++ b/noatun/modules/kaiman/userinterface.cpp @@ -46,7 +46,7 @@ #include <tdelocale.h> #include <tdeconfig.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdeio/netaccess.h> #include <kurldrag.h> @@ -92,27 +92,27 @@ Kaiman::Kaiman() if ( !changeStyle( DEFAULT_SKIN, "skindata" ) ) { KMessageBox::error( this, i18n("Cannot load default skin %1.").arg(DEFAULT_SKIN) ); - TQTimer::singleShot( 0, this, TQT_SLOT(close()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(close()) ); return; } } // global connects - connect( napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) ); - connect( napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) ); + connect( napp, TQ_SIGNAL(hideYourself()), this, TQ_SLOT(hide()) ); + connect( napp, TQ_SIGNAL(showYourself()), this, TQ_SLOT(show()) ); - connect( napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(updateMode())); - connect( napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(updateMode())); - connect( napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(updateMode())); - connect( napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout())); - connect( napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(loopTypeChange(int))); - connect( napp->player(), TQT_SIGNAL(newSongLen(int,int)), this, TQT_SLOT(newSongLen(int,int))); - connect( napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong())); + connect( napp->player(), TQ_SIGNAL(playing()), this, TQ_SLOT(updateMode())); + connect( napp->player(), TQ_SIGNAL(stopped()), this, TQ_SLOT(updateMode())); + connect( napp->player(), TQ_SIGNAL(paused()), this, TQ_SLOT(updateMode())); + connect( napp->player(), TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout())); + connect( napp->player(), TQ_SIGNAL(loopTypeChange(int)), this, TQ_SLOT(loopTypeChange(int))); + connect( napp->player(), TQ_SIGNAL(newSongLen(int,int)), this, TQ_SLOT(newSongLen(int,int))); + connect( napp->player(), TQ_SIGNAL(newSong()), this, TQ_SLOT(newSong())); if( napp->player()->isPlaying() ) newSong(); - new KaimanPrefDlg(TQT_TQOBJECT(this)); + new KaimanPrefDlg(this); show(); } @@ -174,64 +174,64 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc ) } item = _style->find("Playlist_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(toggleListView()) ); item = _style->find("Play_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause()) ); item = _style->find("Pause_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause()) ); item = _style->find("Stop_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(stop()) ); item = _style->find("Next_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(forward()) ); item = _style->find("Prev_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(back()) ); item = _style->find("Exit_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(close()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(close()) ); item = _style->find("Mixer_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(execMixer()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(execMixer()) ); item = _style->find("Iconify_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMinimized()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMinimized()) ); item = _style->find("Alt_Skin_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleSkin()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleSkin()) ); item = _style->find("Repeat_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleLoop()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleLoop()) ); item = _style->find("Shuffle_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleShuffle()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleShuffle()) ); item = _style->find("Config_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp, TQT_SLOT(preferences()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp, TQ_SLOT(preferences()) ); item = _style->find("Volume_Up_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this,TQT_SLOT(volumeUp())); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this,TQ_SLOT(volumeUp())); item = _style->find("Volume_Down_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this,TQT_SLOT(volumeDown())); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this,TQ_SLOT(volumeDown())); KaimanStyleSlider* slider = static_cast<KaimanStyleSlider*>(_style->find("Position_Slider")); if( slider!=0 ) { - connect( slider, TQT_SIGNAL(newValueDrag(int)), this, TQT_SLOT(seekStart(int)) ); - connect( slider, TQT_SIGNAL(newValue(int)), this, TQT_SLOT(seekDrag(int)) ); - connect( slider, TQT_SIGNAL(newValueDrop(int)), this, TQT_SLOT(seekStop(int)) ); + connect( slider, TQ_SIGNAL(newValueDrag(int)), this, TQ_SLOT(seekStart(int)) ); + connect( slider, TQ_SIGNAL(newValue(int)), this, TQ_SLOT(seekDrag(int)) ); + connect( slider, TQ_SIGNAL(newValueDrop(int)), this, TQ_SLOT(seekStop(int)) ); slider->setValue( 0, 0, 1000 ); } slider = static_cast<KaimanStyleSlider*>(_style->find("Volume_Slider")); if ( slider!=0 ) { - connect(slider, TQT_SIGNAL(newValue(int)), this, TQT_SLOT(setVolume(int))); + connect(slider, TQ_SIGNAL(newValue(int)), this, TQ_SLOT(setVolume(int))); slider->setValue( napp->player()->volume(), 0, 100 ); } @@ -372,7 +372,7 @@ void Kaiman::volumeDown() void Kaiman::execMixer() { - kapp->startServiceByDesktopName ( TQString::fromLatin1("kmix"), TQString() ); + tdeApp->startServiceByDesktopName ( TQString::fromLatin1("kmix"), TQString() ); } diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp index 420ccd01..19e29288 100644 --- a/noatun/modules/keyz/keyz.cpp +++ b/noatun/modules/keyz/keyz.cpp @@ -5,7 +5,7 @@ #include <tqlayout.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <kkeydialog.h> #include <tdelocale.h> #include <tqclipboard.h> @@ -14,7 +14,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new Keyz(); } @@ -32,56 +32,56 @@ Keyz::Keyz() : TQObject( 0L, "Keyz" ), Plugin(), preMuteVol(0) s_accel = new TDEGlobalAccel( this, "noatunglobalaccel" ); s_accel->insert( "PlayPause", i18n("Play/Pause"), TQString(), CTRL+ALT+Key_P, KKey::QtWIN+CTRL+Key_P, - player, TQT_SLOT( playpause() )); + player, TQ_SLOT( playpause() )); s_accel->insert( "Stop", i18n("Stop Playing"), TQString(), CTRL+ALT+Key_S, KKey::QtWIN+CTRL+Key_S, - player, TQT_SLOT( stop() )); + player, TQ_SLOT( stop() )); s_accel->insert( "Back", i18n("Back"), TQString(), CTRL+ALT+Key_Left, KKey::QtWIN+CTRL+Key_Left, - player, TQT_SLOT( back() )); + player, TQ_SLOT( back() )); s_accel->insert( "Forward", i18n("Forward"), TQString(), CTRL+ALT+Key_Right, KKey::QtWIN+CTRL+Key_Right, - player, TQT_SLOT( forward() )); + player, TQ_SLOT( forward() )); s_accel->insert( "Playlist", i18n("Show/Hide Playlist"), TQString(), CTRL+ALT+Key_L, KKey::QtWIN+CTRL+Key_L, - player, TQT_SLOT( toggleListView() )); + player, TQ_SLOT( toggleListView() )); s_accel->insert( "OpenFile", i18n("Open File to Play"), TQString(), CTRL+ALT+Key_O, KKey::QtWIN+CTRL+Key_O, - TQT_TQOBJECT(napp), TQT_SLOT( fileOpen() )); + napp, TQ_SLOT( fileOpen() )); s_accel->insert( "Effects", i18n("Effects Configuration"), TQString(), CTRL+ALT+Key_E, KKey::QtWIN+CTRL+Key_E, - TQT_TQOBJECT(napp), TQT_SLOT( effectView() )); + napp, TQ_SLOT( effectView() )); s_accel->insert( "Preferences", i18n("Preferences"), TQString(), CTRL+ALT+Key_F, KKey::QtWIN+CTRL+Key_F, - TQT_TQOBJECT(napp), TQT_SLOT( preferences() )); + napp, TQ_SLOT( preferences() )); s_accel->insert( "VolumeUp", i18n("Volume Up"), TQString(), CTRL+ALT+SHIFT+Key_Up, KKey::QtWIN+CTRL+SHIFT+Key_Up, - this, TQT_SLOT( slotVolumeUp() )); + this, TQ_SLOT( slotVolumeUp() )); s_accel->insert( "VolumeDown", i18n("Volume Down"), TQString(), CTRL+ALT+SHIFT+Key_Down, KKey::QtWIN+CTRL+SHIFT+Key_Down, - this, TQT_SLOT( slotVolumeDown() )); + this, TQ_SLOT( slotVolumeDown() )); s_accel->insert( "Mute", i18n("Mute"), TQString(), CTRL+ALT+Key_M, KKey::QtWIN+CTRL+Key_M, - this, TQT_SLOT( slotMute() )); + this, TQ_SLOT( slotMute() )); s_accel->insert( "SeekForward", i18n("Seek Forward"), TQString(), CTRL+ALT+SHIFT+Key_Right, KKey::QtWIN+CTRL+SHIFT+Key_Right, - this, TQT_SLOT( slotForward() )); + this, TQ_SLOT( slotForward() )); s_accel->insert( "SeekBackward", i18n("Seek Backward"), TQString(), CTRL+ALT+SHIFT+Key_Left, KKey::QtWIN+CTRL+SHIFT+Key_Left, - this, TQT_SLOT( slotBackward() )); + this, TQ_SLOT( slotBackward() )); s_accel->insert( "NextSection", i18n("Next Section"), TQString(), 0, 0, - this, TQT_SLOT( slotNextSection() )); + this, TQ_SLOT( slotNextSection() )); s_accel->insert( "PrevSection", i18n("Previous Section"), TQString(), 0, 0, - this, TQT_SLOT( slotPrevSection() )); + this, TQ_SLOT( slotPrevSection() )); s_accel->insert( "CopyTitle", i18n("Copy Song Title to Clipboard"), TQString(), CTRL+ALT+Key_C, KKey::QtWIN+CTRL+Key_C, - this, TQT_SLOT( slotCopyTitle() )); + this, TQ_SLOT( slotCopyTitle() )); s_accel->insert( "ToggleGUI", i18n("Show/Hide Main Window"), TQString(), CTRL+ALT+Key_W, KKey::QtWIN+CTRL+Key_W, - TQT_TQOBJECT(napp), TQT_SLOT( toggleInterfaces() )); + napp, TQ_SLOT( toggleInterfaces() )); s_accel->readSettings(); s_accel->updateConnections(); @@ -147,7 +147,7 @@ void Keyz::slotPrevSection() void Keyz::slotCopyTitle() { if (napp->player()->current()) - TDEApplication::kApplication()->clipboard()->setText(napp->player()->current().title()); + tdeApp->clipboard()->setText(napp->player()->current().title()); } diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp index 306a82fc..31e1ad96 100644 --- a/noatun/modules/kjofol-skin/kjbutton.cpp +++ b/noatun/modules/kjofol-skin/kjbutton.cpp @@ -87,18 +87,18 @@ KJButton::KJButton(const TQStringList &i, KJLoader *parent) if (mTitle=="playlistbutton") { mShowPressed = napp->playlist()->listVisible(); - connect( napp->player(), TQT_SIGNAL(playlistShown()), this, TQT_SLOT(slotPlaylistShown()) ); - connect( napp->player(), TQT_SIGNAL(playlistHidden()), this, TQT_SLOT(slotPlaylistHidden()) ); + connect( napp->player(), TQ_SIGNAL(playlistShown()), this, TQ_SLOT(slotPlaylistShown()) ); + connect( napp->player(), TQ_SIGNAL(playlistHidden()), this, TQ_SLOT(slotPlaylistHidden()) ); } else if ( mTitle=="equalizeroffbutton") // same goes for EQ buttons { mShowPressed = (!napp->vequalizer()->isEnabled()); - connect( napp->vequalizer(), TQT_SIGNAL(enabled(bool)), TQT_SLOT(slotEqEnabled(bool))); + connect( napp->vequalizer(), TQ_SIGNAL(enabled(bool)), TQ_SLOT(slotEqEnabled(bool))); } else if (mTitle=="equalizeronbutton") { mShowPressed = napp->vequalizer()->isEnabled(); - connect( napp->vequalizer(), TQT_SIGNAL(enabled(bool)), TQT_SLOT(slotEqEnabled(bool))); + connect( napp->vequalizer(), TQ_SIGNAL(enabled(bool)), TQ_SLOT(slotEqEnabled(bool))); } } diff --git a/noatun/modules/kjofol-skin/kjequalizer.cpp b/noatun/modules/kjofol-skin/kjequalizer.cpp index d7d2b9fa..c82d1a93 100644 --- a/noatun/modules/kjofol-skin/kjequalizer.cpp +++ b/noatun/modules/kjofol-skin/kjequalizer.cpp @@ -47,7 +47,7 @@ KJEqualizer::KJEqualizer(const TQStringList &l, KJLoader *p) kdDebug(66666) << "[KJEqualizer] creating VInterpolation for " << mBands << " bands..." << endl; mInterpEq = new VInterpolation(mBands); // napp->vequalizer()->setBands(mBands); // FIXME: hack because spline sucks :P - connect(napp->vequalizer(), TQT_SIGNAL(changed()), this, TQT_SLOT(slotUpdateBuffer())); + connect(napp->vequalizer(), TQ_SIGNAL(changed()), this, TQ_SLOT(slotUpdateBuffer())); slotUpdateBuffer(); // fill mView pixmap with valid data } diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp index ce9c88c8..2763d733 100644 --- a/noatun/modules/kjofol-skin/kjloader.cpp +++ b/noatun/modules/kjofol-skin/kjloader.cpp @@ -61,7 +61,7 @@ #include <tdelocale.h> #include <tdeglobalsettings.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <knotifyclient.h> #include <kpixmapeffect.h> #include <kurldrag.h> @@ -131,8 +131,8 @@ KJLoader::KJLoader() subwidgets.setAutoDelete(true); - mPrefs = new KJPrefs(TQT_TQOBJECT(this)); - connect ( mPrefs, TQT_SIGNAL(configChanged()), this, TQT_SLOT(readConfig()) ); + mPrefs = new KJPrefs(this); + connect ( mPrefs, TQ_SIGNAL(configChanged()), this, TQ_SLOT(readConfig()) ); TQString skin = mPrefs->skin(); if ( TQFile(skin).exists() ) @@ -146,14 +146,14 @@ KJLoader::KJLoader() napp->preferences(); } - mHelpMenu = new KHelpMenu(this, kapp->aboutData()); - connect(napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(timeUpdate())); - connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(timeUpdate())); - connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(newSong())); + mHelpMenu = new KHelpMenu(this, tdeApp->aboutData()); + connect(napp->player(), TQ_SIGNAL(timeout()), TQ_SLOT(timeUpdate())); + connect(napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(timeUpdate())); + connect(napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(newSong())); - connect(napp, TQT_SIGNAL(hideYourself()), TQT_SLOT(hide())); - connect(napp, TQT_SIGNAL(showYourself()), TQT_SLOT(show())); -// KStdAction::quit(napp, TQT_SLOT(quit()), actionCollection()); + connect(napp, TQ_SIGNAL(hideYourself()), TQ_SLOT(hide())); + connect(napp, TQ_SIGNAL(showYourself()), TQ_SLOT(show())); +// KStdAction::quit(napp, TQ_SLOT(quit()), actionCollection()); TQApplication::restoreOverrideCursor(); // newSong(); @@ -371,7 +371,7 @@ void KJLoader::loadSkin(const TQString &file) // I cant believe it, there are skins without a seeker, now THATS stupid :) if (exist("seekregion")) - TQTimer::singleShot(0, this, TQT_SLOT(loadSeeker())); + TQTimer::singleShot(0, this, TQ_SLOT(loadSeeker())); // all the regular buttons for (TQDictIterator<TQStringList> i(*this); i.current(); ++i) @@ -487,11 +487,11 @@ void KJLoader::switchToDockmode() // kdDebug(66666) << "KJLoader::switchToDockmode()" << endl; loadSkin( mCurrentDockModeSkin ); - connect(mWin, TQT_SIGNAL(activeWindowChanged(WId)), this, TQT_SLOT(slotWindowActivate(WId))); - connect(mWin, TQT_SIGNAL(windowRemoved(WId)), this, TQT_SLOT(slotWindowRemove(WId))); - connect(mWin, TQT_SIGNAL(stackingOrderChanged()), this, TQT_SLOT(slotStackingChanged())); - connect(mWin, TQT_SIGNAL(windowChanged(WId)), this, TQT_SLOT(slotWindowChange(WId))); - connect(mWin, TQT_SIGNAL(currentDesktopChanged(int)), this, TQT_SLOT(slotDesktopChange(int))); + connect(mWin, TQ_SIGNAL(activeWindowChanged(WId)), this, TQ_SLOT(slotWindowActivate(WId))); + connect(mWin, TQ_SIGNAL(windowRemoved(WId)), this, TQ_SLOT(slotWindowRemove(WId))); + connect(mWin, TQ_SIGNAL(stackingOrderChanged()), this, TQ_SLOT(slotStackingChanged())); + connect(mWin, TQ_SIGNAL(windowChanged(WId)), this, TQ_SLOT(slotWindowChange(WId))); + connect(mWin, TQ_SIGNAL(currentDesktopChanged(int)), this, TQ_SLOT(slotDesktopChange(int))); WId activeWin = mWin->activeWindow(); if (activeWin && (activeWin != winId())) @@ -676,7 +676,7 @@ void KJLoader::slotStackingChanged() // We seem to get this signal before the window has been restacked, // so we just schedule a restack. - TQTimer::singleShot ( 10, this, TQT_SLOT(restack()) ); + TQTimer::singleShot ( 10, this, TQ_SLOT(restack()) ); // kdDebug(66666) << "END slotStackingChanged()" << endl; } @@ -822,7 +822,7 @@ void KJLoader::showSplash() splashScreen->show(); napp->processEvents(); // we want this one time to get the splash actually displayed ASAP - TQTimer::singleShot(3000, this, TQT_SLOT(hideSplash()) ); + TQTimer::singleShot(3000, this, TQ_SLOT(hideSplash()) ); } void KJLoader::hideSplash() diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp index cb341ea3..91838f5c 100644 --- a/noatun/modules/kjofol-skin/kjprefs.cpp +++ b/noatun/modules/kjofol-skin/kjprefs.cpp @@ -37,8 +37,8 @@ #include <tdemessagebox.h> #include <kmimemagic.h> #include <knotifyclient.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <tdeglobalsettings.h> #include <tdefontcombo.h> #include <kcolorcombo.h> @@ -63,9 +63,9 @@ KJPrefs::KJPrefs(TQObject* parent) mTabWidget->insertTab( mSkinselectorWidget, i18n("&Skin Selector") ); mTabWidget->insertTab( mGuiSettingsWidget, i18n("O&ther Settings") ); - connect ( mSkinselectorWidget->mSkins, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(showPreview(const TQString&)) ); - connect ( mSkinselectorWidget->installButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(installNewSkin()) ); - connect ( mSkinselectorWidget->mRemoveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeSelectedSkin()) ); + connect ( mSkinselectorWidget->mSkins, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(showPreview(const TQString&)) ); + connect ( mSkinselectorWidget->installButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(installNewSkin()) ); + connect ( mSkinselectorWidget->mRemoveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeSelectedSkin()) ); reopen(); // fill the skinlist and draw a preview } @@ -488,7 +488,7 @@ void KJPrefs::installNewSkin( void ) kdDebug(66666) << "src: " << src.path().latin1() << endl; kdDebug(66666) << "dst: " << dst.path().latin1() << endl; TDEIO::Job *job = TDEIO::copy(src,dst); - connect ( job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotResult(TDEIO::Job*)) ); + connect ( job, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotResult(TDEIO::Job*)) ); skinInstalled = true; } } // END iterate trough dirList @@ -555,7 +555,7 @@ void KJPrefs::removeSelectedSkin( void ) { kdDebug(66666) << "Deleting Skindir: " << dirToDelete.latin1() << endl; TDEIO::Job *job = TDEIO::del( dirToDelete, false, true ); - connect ( job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotResult(TDEIO::Job*)) ); + connect ( job, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotResult(TDEIO::Job*)) ); } int item = -1; diff --git a/noatun/modules/kjofol-skin/noatunui.cpp b/noatun/modules/kjofol-skin/noatunui.cpp index b5be87fd..4541e45b 100644 --- a/noatun/modules/kjofol-skin/noatunui.cpp +++ b/noatun/modules/kjofol-skin/noatunui.cpp @@ -2,7 +2,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new KJLoader(); } diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp index f7a6e5ff..ba3c258b 100644 --- a/noatun/modules/marquis/marquis.cpp +++ b/noatun/modules/marquis/marquis.cpp @@ -78,9 +78,9 @@ Marquis::Marquis() // for testing: uncomment this and use // dcop `dcop | grep noatun` Marquis activateAction dynamicRestore // and dynamicSave accordingly. -// (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() )); +// (void) new TDEAction("Restore", 0, this, TQ_SLOT( dynamicRestore() ), actionCollection(), "dynamicRestore" ); +// (void) new TDEAction("Save", 0, this, TQ_SLOT( dynamicSave() ), actionCollection(), "dynamicSave" ); + connect( napp, TQ_SIGNAL( saveYourself() ), TQ_SLOT( dynamicSave() )); } Marquis::~Marquis() diff --git a/noatun/modules/marquis/plugin.cpp b/noatun/modules/marquis/plugin.cpp index 146b0979..e9ccc0e2 100644 --- a/noatun/modules/marquis/plugin.cpp +++ b/noatun/modules/marquis/plugin.cpp @@ -2,7 +2,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new Marquis(); } diff --git a/noatun/modules/metatag/edit.cpp b/noatun/modules/metatag/edit.cpp index 72064a4a..16d09ece 100644 --- a/noatun/modules/metatag/edit.cpp +++ b/noatun/modules/metatag/edit.cpp @@ -49,8 +49,8 @@ Editor::Editor() mControls.setAutoDelete(true); mNextRow = 2; - connect(this, TQT_SIGNAL(closeClicked()), TQT_SLOT(delayedDestruct())); - connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(save())); + connect(this, TQ_SIGNAL(closeClicked()), TQ_SLOT(delayedDestruct())); + connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(save())); enableButtonSeparator(true); setFixedHeight(sizeHint().height()); @@ -182,7 +182,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe // Get the correct validator if ( info && !groupName.isNull() ) - validator = info->createValidator( groupName, key, TQT_TQOBJECT(parent) ); + validator = info->createValidator( groupName, key, parent ); // meta_widget is used for book-keeping internally meta_widget = new MetaWidget; @@ -215,7 +215,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe box->setValue(info_item.value().toInt()); - connect(box, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(modified())); + connect(box, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(modified())); meta_widget->widget = box; } else { @@ -234,7 +234,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe >(validator)->stringList()); combo->setCurrentText(info_item.value().toString()); - connect(combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(modified())); + connect(combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(modified())); meta_widget->widget = combo; } @@ -244,7 +244,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe edit = new KLineEdit(parent); edit->setText(info_item.value().toString()); edit->setValidator(validator); - connect(edit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(modified())); + connect(edit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(modified())); meta_widget->widget = edit; } diff --git a/noatun/modules/metatag/metatag.cpp b/noatun/modules/metatag/metatag.cpp index 801ddf0f..1df53d35 100644 --- a/noatun/modules/metatag/metatag.cpp +++ b/noatun/modules/metatag/metatag.cpp @@ -24,7 +24,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new MetaTagLoader; } @@ -32,7 +32,7 @@ extern "C" MetaTagLoader::MetaTagLoader():Plugin() { - mAction = new TDEAction(i18n("&Tag Editor..."), "edit", 0, this, TQT_SLOT(editTag()), this, "edittag"); + mAction = new TDEAction(i18n("&Tag Editor..."), "edit", 0, this, TQ_SLOT(editTag()), this, "edittag"); napp->pluginActionMenu()->insert(mAction); } @@ -52,8 +52,8 @@ void MetaTagLoader::editTag() e->open(i); e->show(); - connect(e, TQT_SIGNAL(saved(PlaylistItem &)), - TQT_SLOT(update(PlaylistItem &))); + connect(e, TQ_SIGNAL(saved(PlaylistItem &)), + TQ_SLOT(update(PlaylistItem &))); } bool MetaTagLoader::update(PlaylistItem & item) diff --git a/noatun/modules/monoscope/monoscope.cpp b/noatun/modules/monoscope/monoscope.cpp index 7ab51333..4c717c42 100644 --- a/noatun/modules/monoscope/monoscope.cpp +++ b/noatun/modules/monoscope/monoscope.cpp @@ -9,7 +9,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new Monoscope(); } @@ -41,7 +41,7 @@ Monoscope::~Monoscope() void Monoscope::init() { mAction = new TDEToggleAction(i18n("Toggle Monoscope"), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(toggle()), TQT_TQOBJECT(this), "togglemonoscope"); + this, TQ_SLOT(toggle()), this, "togglemonoscope"); mAction->setChecked(!isHidden()); napp->pluginActionMenu()->insert(mAction); } diff --git a/noatun/modules/net/net.cpp b/noatun/modules/net/net.cpp index dbdd7e2f..752b2005 100644 --- a/noatun/modules/net/net.cpp +++ b/noatun/modules/net/net.cpp @@ -4,7 +4,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new Net(); } @@ -14,7 +14,7 @@ extern "C" Net::Net() : TQServerSocket(7539, 10), Plugin() { mFDs.setAutoDelete(true); - connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(newSong())); + connect(napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(newSong())); } Net::~Net() diff --git a/noatun/modules/noatunui/noatunui.cpp b/noatun/modules/noatunui/noatunui.cpp index adb9534b..081b9158 100644 --- a/noatun/modules/noatunui/noatunui.cpp +++ b/noatun/modules/noatunui/noatunui.cpp @@ -2,7 +2,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new MilkChocolate; } diff --git a/noatun/modules/noatunui/userinterface.cpp b/noatun/modules/noatunui/userinterface.cpp index 250d79a9..7fbc497b 100644 --- a/noatun/modules/noatunui/userinterface.cpp +++ b/noatun/modules/noatunui/userinterface.cpp @@ -37,45 +37,45 @@ MilkChocolate::MilkChocolate() : TQWidget(0,"NoatunUI"), UserInterface() mBack=new TQPushButton(this); mBack->setFixedSize(buttonSize,buttonSize); mBack->setPixmap(BarIcon("noatunback")); - connect(mBack, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back())); + connect(mBack, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(back())); TQToolTip::add(mBack,i18n("Back")); mStop=new TQPushButton(this); mStop->setFixedSize(buttonSize,buttonSize); mStop->setPixmap(BarIcon("noatunstop")); - connect(mStop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop())); + connect(mStop, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(stop())); TQToolTip::add(mStop, i18n("Stop")); mPlay=new TQPushButton(this); mPlay->setToggleButton(true); mPlay->setFixedSize(buttonSize,buttonSize); mPlay->setPixmap(BarIcon("noatunplay")); - connect(mPlay, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause())); + connect(mPlay, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause())); TQToolTip::add(mPlay, i18n("Play")); mForward=new TQPushButton(this); mForward->setFixedSize(buttonSize,buttonSize); mForward->setPixmap(BarIcon("noatunforward")); - connect(mForward, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward())); + connect(mForward, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(forward())); TQToolTip::add(mForward, i18n("Forward")); mPlaylist=new TQPushButton(this); mPlaylist->setToggleButton(true); mPlaylist->setFixedSize(buttonSize,buttonSize); mPlaylist->setPixmap(BarIcon("noatunplaylist")); - connect(mPlaylist, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView())); + connect(mPlaylist, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(toggleListView())); TQToolTip::add(mPlaylist, i18n("Playlist")); mLoop=new TQPushButton(this); mLoop->setFixedSize(buttonSize,buttonSize); mLoop->setPixmap(BarIcon("noatunloopnone")); - connect(mLoop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(loop())); + connect(mLoop, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(loop())); TQToolTip::add(mLoop, i18n("Change loop style")); mPopup=new TQPushButton(this); mPopup->setFixedSize(buttonSize,buttonSize); mPopup->setPixmap(BarIcon("noatun")); - connect(mPopup, TQT_SIGNAL(clicked()), TQT_SLOT(popup())); + connect(mPopup, TQ_SIGNAL(clicked()), TQ_SLOT(popup())); // TQToolTip::add(mRemoveCurrent, i18n("Remove current file from playlist")); } @@ -104,32 +104,32 @@ MilkChocolate::MilkChocolate() : TQWidget(0,"NoatunUI"), UserInterface() statusBar()->message(i18n("No File Loaded")); statusBar()->insertItem("--:--/--:--", 1, 0, true); - connect(napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) ); - connect(napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) ); + connect(napp, TQ_SIGNAL(hideYourself()), this, TQ_SLOT(hide()) ); + connect(napp, TQ_SIGNAL(showYourself()), this, TQ_SLOT(show()) ); - connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlaying())); - connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped())); - connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPaused())); + connect(napp->player(), TQ_SIGNAL(playing()), this, TQ_SLOT(slotPlaying())); + connect(napp->player(), TQ_SIGNAL(stopped()), this, TQ_SLOT(slotStopped())); + connect(napp->player(), TQ_SIGNAL(paused()), this, TQ_SLOT(slotPaused())); napp->player()->handleButtons(); - connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); - connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(changeLoopType(int))); + connect(napp->player(), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); + connect(napp->player(), TQ_SIGNAL(loopTypeChange(int)), this, TQ_SLOT(changeLoopType(int))); // if(seeker()) { /* This skipToWrapper is needed to pass milliseconds to Player() as everybody * below the GUI is based on milliseconds instead of some unprecise thingy * like seconds or mille */ - connect(seeker(), TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int))); - connect(this, TQT_SIGNAL(skipTo(int)), napp->player(), TQT_SLOT(skipTo(int))); - connect(seeker(), TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(sliderMoved(int))); + connect(seeker(), TQ_SIGNAL(userChanged(int)), this, TQ_SLOT(skipToWrapper(int))); + connect(this, TQ_SIGNAL(skipTo(int)), napp->player(), TQ_SLOT(skipTo(int))); + connect(seeker(), TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(sliderMoved(int))); } - connect(mVolume, TQT_SIGNAL(sliderMoved(int)), napp->player(), TQT_SLOT(setVolume(int))); - connect(mVolume, TQT_SIGNAL(userChanged(int)), napp->player(), TQT_SLOT(setVolume(int))); + connect(mVolume, TQ_SIGNAL(sliderMoved(int)), napp->player(), TQ_SLOT(setVolume(int))); + connect(mVolume, TQ_SIGNAL(userChanged(int)), napp->player(), TQ_SLOT(setVolume(int))); - connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(playlistShown())); - connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(playlistHidden())); + connect(napp->player(), TQ_SIGNAL(playlistShown()), TQ_SLOT(playlistShown())); + connect(napp->player(), TQ_SIGNAL(playlistHidden()), TQ_SLOT(playlistHidden())); // Event Filter for the RMB for (TQPtrListIterator<TQObject> i(childrenListObject()); i.current(); ++i) @@ -205,7 +205,7 @@ void MilkChocolate::popup() void MilkChocolate::slotPlaying() { -// connect(twinmodule, TQT_SIGNAL(windowAdded(WId)), view, TQT_SLOT(attemptReparent(WId))); +// connect(twinmodule, TQ_SIGNAL(windowAdded(WId)), view, TQ_SLOT(attemptReparent(WId))); changeStatusbar(napp->player()->current().title(), napp->player()->lengthString()); mPlay->setOn(true); mStop->setEnabled(true); diff --git a/noatun/modules/simple/noatunui.cpp b/noatun/modules/simple/noatunui.cpp index 3b647e42..ba2ca067 100644 --- a/noatun/modules/simple/noatunui.cpp +++ b/noatun/modules/simple/noatunui.cpp @@ -13,5 +13,5 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() { return new SimpleUI(); } + TDE_EXPORT Plugin *create_plugin() { return new SimpleUI(); } } diff --git a/noatun/modules/simple/propertiesdialog.ui b/noatun/modules/simple/propertiesdialog.ui index ca13195a..9ac59ed1 100644 --- a/noatun/modules/simple/propertiesdialog.ui +++ b/noatun/modules/simple/propertiesdialog.ui @@ -341,8 +341,8 @@ <include location="global" impldecl="in declaration">kmimetype.h</include> <include location="local" impldecl="in implementation">propertiesdialog.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot specifier="non virtual">setPlayObject( PlaylistItem pi, Arts::PlayObject po )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp index 929ada84..72edda51 100644 --- a/noatun/modules/simple/userinterface.cpp +++ b/noatun/modules/simple/userinterface.cpp @@ -63,14 +63,14 @@ SimpleUI::SimpleUI() setupGUI( StatusBar|Create, "simpleui.rc" ); - connect( napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(slotPlaying()) ); - connect( napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(slotStopped()) ); - connect( napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(slotPaused()) ); - connect( napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); - connect( napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(slotChanged()) ); - connect( napp->player(), TQT_SIGNAL(volumeChanged(int)), TQT_SLOT(slotVolumeChanged(int)) ); - connect( napp, TQT_SIGNAL(hideYourself()), TQT_SLOT(hide()) ); - connect( napp, TQT_SIGNAL(showYourself()), TQT_SLOT(show()) ); + connect( napp->player(), TQ_SIGNAL(playing()), TQ_SLOT(slotPlaying()) ); + connect( napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(slotStopped()) ); + connect( napp->player(), TQ_SIGNAL(paused()), TQ_SLOT(slotPaused()) ); + connect( napp->player(), TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) ); + connect( napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(slotChanged()) ); + connect( napp->player(), TQ_SIGNAL(volumeChanged(int)), TQ_SLOT(slotVolumeChanged(int)) ); + connect( napp, TQ_SIGNAL(hideYourself()), TQ_SLOT(hide()) ); + connect( napp, TQ_SIGNAL(showYourself()), TQ_SLOT(show()) ); napp->player()->handleButtons(); @@ -126,10 +126,10 @@ SimpleUI::~SimpleUI() void SimpleUI::setupActions() { - KStdAction::open( TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection(), "_file_open" ); - new TDEAction( i18n("&Properties"), 0, TQT_TQOBJECT(propertiesDialog), TQT_SLOT(show()), + KStdAction::open( napp, TQ_SLOT(fileOpen()), actionCollection(), "_file_open" ); + new TDEAction( i18n("&Properties"), 0, propertiesDialog, TQ_SLOT(show()), actionCollection(), "_file_properties" ); - KStdAction::quit( TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection(), "_file_quit"); + KStdAction::quit( napp, TQ_SLOT(quit()), actionCollection(), "_file_quit"); NoatunStdAction::playlist( actionCollection(), "view_playlist" ); actionCollection()->insert(video->action( "half_size" )); @@ -139,14 +139,14 @@ void SimpleUI::setupActions() actionCollection()->insert(napp->pluginActionMenu()); - menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()), + menubarAction = KStdAction::showMenubar(this, TQ_SLOT(showMenubar()), actionCollection()); - statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(showStatusbar()), + statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(showStatusbar()), actionCollection()); NoatunStdAction::effects( actionCollection(), "effects" ); NoatunStdAction::equalizer( actionCollection(), "equalizer" ); NoatunStdAction::loop( actionCollection(), "loop_style" ); - KStdAction::preferences( TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection() ); + KStdAction::preferences( napp, TQ_SLOT(preferences()), actionCollection() ); } void SimpleUI::showMenubar() @@ -178,10 +178,10 @@ void SimpleUI::setupCentralWidget() statusBar()->addWidget( positionLabel, 0, true ); video = new VideoFrame( npWidget ); - connect( video, TQT_SIGNAL(adaptSize(int,int)), - TQT_SLOT(slotAdaptSize(int,int)) ); - connect( video, TQT_SIGNAL(rightButtonPressed(const TQPoint &)), - TQT_SLOT(slotContextMenu(const TQPoint &)) ); + connect( video, TQ_SIGNAL(adaptSize(int,int)), + TQ_SLOT(slotAdaptSize(int,int)) ); + connect( video, TQ_SIGNAL(rightButtonPressed(const TQPoint &)), + TQ_SLOT(slotContextMenu(const TQPoint &)) ); TQHBox *ctlFrame = new TQHBox( npWidget ); ctlFrame->setFixedHeight( 38 ); @@ -194,38 +194,38 @@ void SimpleUI::setupCentralWidget() backButton->setFixedSize( 24, 24 ); backButton->setPixmap( TQPixmap( back_xpm ) ); TQToolTip::add( backButton, i18n("Back") ); - connect( backButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back()) ); + connect( backButton, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(back()) ); stopButton = new TQPushButton( ctlFrame ); stopButton->setFixedSize( 24, 24 ); stopButton->setPixmap( TQPixmap( stop_xpm ) ); TQToolTip::add( stopButton, i18n("Stop") ); - connect( stopButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop()) ); + connect( stopButton, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(stop()) ); playButton = new TQPushButton( ctlFrame ); playButton->setFixedSize( 24, 24 ); playButton->setPixmap( TQPixmap( play_xpm ) ); TQToolTip::add( playButton, i18n("Play / Pause") ); - connect( playButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) ); + connect( playButton, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause()) ); TQPushButton *forwButton = new TQPushButton( ctlFrame ); forwButton->setFixedSize( 24, 24 ); forwButton->setPixmap( TQPixmap( forward_xpm ) ); TQToolTip::add( forwButton, i18n("Forward") ); - connect( forwButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward()) ); + connect( forwButton, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(forward()) ); slider = new L33tSlider( 0, 1000, 10, 0, TQt::Horizontal, ctlFrame ); slider->setFixedHeight( 24 ); slider->setMinimumWidth( 100 ); slider->setTickmarks( TQSlider::NoMarks ); - connect( slider, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotSkipTo(int)) ); - connect( slider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(slotSliderMoved(int)) ); + connect( slider, TQ_SIGNAL(userChanged(int)), TQ_SLOT(slotSkipTo(int)) ); + connect( slider, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(slotSliderMoved(int)) ); TQPushButton *playlistButton = new TQPushButton( ctlFrame ); playlistButton->setFixedSize( 24, 24 ); playlistButton->setPixmap( TQPixmap( playlist_xpm ) ); TQToolTip::add( playlistButton, i18n("Playlist") ); - connect( playlistButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView()) ); + connect( playlistButton, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(toggleListView()) ); volumeButton = new TQPushButton( ctlFrame ); volumeButton->setFixedSize( 24, 24 ); @@ -248,9 +248,9 @@ void SimpleUI::setupCentralWidget() volumeFrame->resize( volumeFrame->sizeHint() ); - connect( volumeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(slotVolumeSliderMoved(int)) ); - connect( volumeSlider, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotVolumeSliderMoved(int)) ); - connect( volumeButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotVolumeFrame()) ); + connect( volumeSlider, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(slotVolumeSliderMoved(int)) ); + connect( volumeSlider, TQ_SIGNAL(userChanged(int)), TQ_SLOT(slotVolumeSliderMoved(int)) ); + connect( volumeButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotVolumeFrame()) ); setCentralWidget( npWidget ); diff --git a/noatun/modules/splitplaylist/find.cpp b/noatun/modules/splitplaylist/find.cpp index 67b7f332..7c504383 100644 --- a/noatun/modules/splitplaylist/find.cpp +++ b/noatun/modules/splitplaylist/find.cpp @@ -26,10 +26,10 @@ Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), C layout->addWidget(mRegexp, 1, 0); layout->addWidget(mBackwards, 1, 1); - connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(clicked())); + connect(this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(clicked())); - connect(mText, TQT_SIGNAL(activated(int)), TQT_SLOT(clicked())); - connect(mText, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChanged(const TQString &))); + connect(mText, TQ_SIGNAL(activated(int)), TQ_SLOT(clicked())); + connect(mText, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(textChanged(const TQString &))); enableButton(User1, false); } diff --git a/noatun/modules/splitplaylist/playlist.cpp b/noatun/modules/splitplaylist/playlist.cpp index 34690f91..d940c8ca 100644 --- a/noatun/modules/splitplaylist/playlist.cpp +++ b/noatun/modules/splitplaylist/playlist.cpp @@ -20,9 +20,9 @@ SplitPlaylist::SplitPlaylist() void SplitPlaylist::init() { view=new View(this); // 195 - connect(view->listView(), TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(listItemSelected(TQListViewItem*))); - connect(view, TQT_SIGNAL(shown()), TQT_SIGNAL(listShown())); - connect(view, TQT_SIGNAL(hidden()), TQT_SIGNAL(listHidden())); + connect(view->listView(), TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(listItemSelected(TQListViewItem*))); + connect(view, TQ_SIGNAL(shown()), TQ_SIGNAL(listShown())); + connect(view, TQ_SIGNAL(hidden()), TQ_SIGNAL(listHidden())); view->init(); // 1000 } diff --git a/noatun/modules/splitplaylist/splitplaylist.cpp b/noatun/modules/splitplaylist/splitplaylist.cpp index fd854311..92e075a5 100644 --- a/noatun/modules/splitplaylist/splitplaylist.cpp +++ b/noatun/modules/splitplaylist/splitplaylist.cpp @@ -5,7 +5,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new SplitPlaylist(); } diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp index b7481125..f724d490 100644 --- a/noatun/modules/splitplaylist/view.cpp +++ b/noatun/modules/splitplaylist/view.cpp @@ -26,8 +26,8 @@ #include <tdeio/netaccess.h> #include <tdelocale.h> #include <tdemenubar.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <kstdaction.h> #include <kedittoolbar.h> #include <kurldrag.h> @@ -49,7 +49,7 @@ SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, co addRef(); setUrl(text); - static_cast<TDEListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after); + static_cast<TDEListView*>(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<TDEListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after); + static_cast<TDEListView*>(parent)->moveItem(this, 0, after); modified(); if (!streamable() && enqueue(url())) @@ -355,10 +355,10 @@ List::List(View *parent) setDragEnabled(true); setItemsMovable(true); setSelectionMode(TQListView::Extended); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), TQT_SLOT(dropEvent(TQDropEvent*, TQListViewItem*))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(moved()), TQT_SLOT(move())); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(aboutToMove()), parent, TQT_SLOT(setNoSorting())); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(deleteCurrentItem()), parent, TQT_SLOT(deleteSelected())); + connect(this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), TQ_SLOT(dropEvent(TQDropEvent*, TQListViewItem*))); + connect(this, TQ_SIGNAL(moved()), TQ_SLOT(move())); + connect(this, TQ_SIGNAL(aboutToMove()), parent, TQ_SLOT(setNoSorting())); + connect(this, TQ_SIGNAL(deleteCurrentItem()), parent, TQ_SLOT(deleteSelected())); } List::~List() @@ -377,7 +377,7 @@ bool List::acceptDrag(TQDropEvent *event) const void List::dropEvent(TQDropEvent *event, TQListViewItem *after) { - static_cast<View*>(TQT_TQWIDGET(parent()))->setNoSorting(); + static_cast<View*>(parent())->setNoSorting(); KURL::List textlist; if (!KURLDrag::decode(event, textlist)) return; event->acceptAction(); @@ -569,16 +569,16 @@ void List::addNextPendingDirectory() currentJobURL= *pendingIt; listJob= TDEIO::listRecursive(currentJobURL, false,false); connect( - listJob, TQT_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&)) + listJob, TQ_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&)) ); connect( - listJob, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotResult(TDEIO::Job *)) + listJob, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotResult(TDEIO::Job *)) ); connect( - listJob, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL &)), - TQT_SLOT(slotRedirection(TDEIO::Job *, const KURL &)) + listJob, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL &)), + TQ_SLOT(slotRedirection(TDEIO::Job *, const KURL &)) ); pendingAddDirectories.remove(pendingIt); } @@ -638,25 +638,25 @@ View::View(SplitPlaylist *) { list=new List(this); setCentralWidget(list); - connect(list, TQT_SIGNAL(modified(void)), TQT_TQOBJECT(this), TQT_SLOT(setModified(void)) ); + connect(list, TQ_SIGNAL(modified(void)), this, TQ_SLOT(setModified(void)) ); // connect the click on the header with sorting - connect(list->header(),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(headerClicked(int)) ); + connect(list->header(),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(headerClicked(int)) ); - 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"), "edit-delete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(deleteSelected()), actionCollection(), "delete"); + mOpen=new TDEAction(i18n("Add &Files..."), "queue", 0, this, TQ_SLOT(addFiles()), actionCollection(), "add_files"); + (void) new TDEAction(i18n("Add Fol&ders..."), "folder", 0, this, TQ_SLOT(addDirectory()), actionCollection(), "add_dir"); + mDelete=new TDEAction(i18n("Delete"), "edit-delete", Key_Delete, this, TQ_SLOT(deleteSelected()), actionCollection(), "delete"); - mClose=KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - mFind=KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(find()), actionCollection()); + mClose=KStdAction::close(this, TQ_SLOT(close()), actionCollection()); + mFind=KStdAction::find(this, TQ_SLOT(find()), actionCollection()); - (void) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection()); - mOpenNew=KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(openNew()), actionCollection()); - mOpenpl=KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection()); - mSave=KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); - mSaveAs=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection()); + (void) KStdAction::configureToolbars(this, TQ_SLOT(configureToolBars()), actionCollection()); + mOpenNew=KStdAction::openNew(this, TQ_SLOT(openNew()), actionCollection()); + mOpenpl=KStdAction::open(this, TQ_SLOT(open()), actionCollection()); + mSave=KStdAction::save(this, TQ_SLOT(save()), actionCollection()); + mSaveAs=KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection()); - (void) new TDEAction(i18n("Shuffle"), "misc", 0, TQT_TQOBJECT(SPL), TQT_SLOT( randomize() ), actionCollection(), "shuffle"); - (void) new TDEAction(i18n("Clear"), "edit-clear", 0, TQT_TQOBJECT(list), TQT_SLOT( clear() ), actionCollection(), "clear"); + (void) new TDEAction(i18n("Shuffle"), "misc", 0, SPL, TQ_SLOT( randomize() ), actionCollection(), "shuffle"); + (void) new TDEAction(i18n("Clear"), "edit-clear", 0, list, TQ_SLOT( clear() ), actionCollection(), "clear"); createGUI("splui.rc"); @@ -669,7 +669,7 @@ View::View(SplitPlaylist *) void View::find() { mFinder->show(); - connect(mFinder, TQT_SIGNAL(search(Finder*)), TQT_SLOT(findIt(Finder*))); + connect(mFinder, TQ_SIGNAL(search(Finder*)), TQ_SLOT(findIt(Finder*))); } static bool testWord(TQListViewItem *i, const TQString &finder) @@ -967,7 +967,7 @@ void View::configureToolBars() { saveMainWindowSettings(TDEGlobal::config(), "SPL Window"); KEditToolbar dlg(actionCollection(), "splui.rc"); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolBarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(newToolBarConfig())); dlg.exec(); } diff --git a/noatun/modules/systray/cmodule.cpp b/noatun/modules/systray/cmodule.cpp index 189d1539..e9e33d16 100644 --- a/noatun/modules/systray/cmodule.cpp +++ b/noatun/modules/systray/cmodule.cpp @@ -58,9 +58,9 @@ YHModule::YHModule(TQObject *_parent) mWidget->cmbModifier->insertItem(i18n("Ctrl"), YHConfig::Ctrl); mWidget->cmbModifier->setCurrentItem(YHConfig::None); - connect(mWidget->chkUsePopup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotUsePopupToggled(bool))); - connect(mWidget->cmbModifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotModifierActivated(int))); - connect(mWidget->grpMwheel, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotMwheelClicked(int))); + connect(mWidget->chkUsePopup, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotUsePopupToggled(bool))); + connect(mWidget->cmbModifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotModifierActivated(int))); + connect(mWidget->grpMwheel, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotMwheelClicked(int))); reopen(); } diff --git a/noatun/modules/systray/noatunui.cpp b/noatun/modules/systray/noatunui.cpp index 76f9af25..3beac24e 100644 --- a/noatun/modules/systray/noatunui.cpp +++ b/noatun/modules/systray/noatunui.cpp @@ -2,7 +2,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new NoatunSystray(); } diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp index 2a7953d3..ee3024ec 100644 --- a/noatun/modules/systray/systray.cpp +++ b/noatun/modules/systray/systray.cpp @@ -58,7 +58,7 @@ #include <kurl.h> #include <tdeio/netaccess.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <netwm.h> #include <tdeglobalsettings.h> @@ -100,9 +100,9 @@ NoatunSystray::NoatunSystray() : TDEMainWindow(0, "NoatunSystray"), Plugin(), removeCover(); // make sure any old temp cover is gone - KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection()); - KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection()); + KStdAction::quit(napp, TQ_SLOT(quit()), actionCollection()); + KStdAction::open(napp, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::preferences(napp, TQ_SLOT(preferences()), actionCollection()); NoatunStdAction::back(actionCollection(), "back"); NoatunStdAction::stop(actionCollection(), "stop"); NoatunStdAction::playpause(actionCollection(), "play"); @@ -124,11 +124,11 @@ NoatunSystray::NoatunSystray() : TDEMainWindow(0, "NoatunSystray"), Plugin(), showingTrayStatus = false; mBlinkTimer = new TQTimer(this); - connect(mBlinkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotBlinkTimer())); + connect(mBlinkTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotBlinkTimer())); - connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlayPause())); - connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPlayPause())); - connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped())); + connect(napp->player(), TQ_SIGNAL(playing()), this, TQ_SLOT(slotPlayPause())); + connect(napp->player(), TQ_SIGNAL(paused()), this, TQ_SLOT(slotPlayPause())); + connect(napp->player(), TQ_SIGNAL(stopped()), this, TQ_SLOT(slotStopped())); //napp->player()->handleButtons(); } @@ -145,8 +145,8 @@ NoatunSystray::~NoatunSystray() void NoatunSystray::init() { - YHModule *cmod = new YHModule(TQT_TQOBJECT(this)); - connect(cmod, TQT_SIGNAL(saved()), this, TQT_SLOT(slotLoadSettings())); + YHModule *cmod = new YHModule(this); + connect(cmod, TQ_SIGNAL(saved()), this, TQ_SLOT(slotLoadSettings())); slotLoadSettings(); } @@ -364,7 +364,7 @@ void NoatunSystray::setTipText(const TQString& text) YHConfig *c = YHConfig::self(); if(c->passivePopup()) - TQTimer::singleShot(0, this, TQT_SLOT(showPassivePopup())); + TQTimer::singleShot(0, this, TQ_SLOT(showPassivePopup())); if(c->tip()) TQToolTip::add(mTray, tipText); @@ -405,11 +405,11 @@ void NoatunSystray::showPassivePopup() TQPushButton *forwardButton = new TQPushButton(action("forward")->iconSet(), 0, buttonBox, "popup_forward"); forwardButton->setFlat(true); - connect(forwardButton, TQT_SIGNAL(clicked()), action("forward"), TQT_SLOT(activate())); + connect(forwardButton, TQ_SIGNAL(clicked()), action("forward"), TQ_SLOT(activate())); TQPushButton *backButton = new TQPushButton(action("back")->iconSet(), 0, buttonBox, "popup_back"); backButton->setFlat(true); - connect(backButton, TQT_SIGNAL(clicked()), action("back"), TQT_SLOT(activate())); + connect(backButton, TQ_SIGNAL(clicked()), action("back"), TQ_SLOT(activate())); TQFrame *line = new TQFrame(box); line->setFrameShape(TQFrame::VLine); @@ -429,11 +429,11 @@ void NoatunSystray::showPassivePopup() TQPushButton *forwardButton = new TQPushButton(action("forward")->iconSet(), 0, buttonBox, "popup_forward"); forwardButton->setFlat(true); - connect(forwardButton, TQT_SIGNAL(clicked()), action("forward"), TQT_SLOT(activate())); + connect(forwardButton, TQ_SIGNAL(clicked()), action("forward"), TQ_SLOT(activate())); TQPushButton *backButton = new TQPushButton(action("back")->iconSet(), 0, buttonBox, "popup_back"); backButton->setFlat(true); - connect(backButton, TQT_SIGNAL(clicked()), action("back"), TQT_SLOT(activate())); + connect(backButton, TQ_SIGNAL(clicked()), action("back"), TQ_SLOT(activate())); } mPassivePopup->setView(box); } diff --git a/noatun/modules/voiceprint/voiceprint.cpp b/noatun/modules/voiceprint/voiceprint.cpp index c0b1c859..f9f65105 100644 --- a/noatun/modules/voiceprint/voiceprint.cpp +++ b/noatun/modules/voiceprint/voiceprint.cpp @@ -9,7 +9,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new VoicePrint(); } @@ -35,7 +35,7 @@ VoicePrint::~VoicePrint() void VoicePrint::init() { - Prefs *p=new Prefs(TQT_TQOBJECT(this)); + Prefs *p=new Prefs(this); p->reopen(); p->save(); resizeEvent(0); diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.cpp b/noatun/modules/winskin/guiSpectrumAnalyser.cpp index a1ff8cdc..46be1e2f 100644 --- a/noatun/modules/winskin/guiSpectrumAnalyser.cpp +++ b/noatun/modules/winskin/guiSpectrumAnalyser.cpp @@ -28,7 +28,7 @@ GuiSpectrumAnalyser::GuiSpectrumAnalyser() : WaWidget(_WA_MAPPING_ANALYSER) { - connect(WaSkinModel::instance(), TQT_SIGNAL(skinChanged()), this, TQT_SLOT(pixmapChange())); + connect(WaSkinModel::instance(), TQ_SIGNAL(skinChanged()), this, TQ_SLOT(pixmapChange())); contextMenu = new TQPopupMenu(this); visualizationMenu = new TQPopupMenu(); @@ -40,13 +40,13 @@ GuiSpectrumAnalyser::GuiSpectrumAnalyser() visualizationMenu->insertItem(i18n("Analyzer"), (int)MODE_ANALYSER); visualizationMenu->insertItem(i18n("Disabled"), (int)MODE_DISABLED); visualizationMenu->setCheckable(true); - connect(visualizationMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setVisualizationMode(int))); + connect(visualizationMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setVisualizationMode(int))); analyserMenu->insertItem(i18n("Normal"), (int)MODE_NORMAL); analyserMenu->insertItem(i18n("Fire"), (int)MODE_FIRE); analyserMenu->insertItem(i18n("Vertical Lines"), (int)MODE_VERTICAL_LINES); analyserMenu->setCheckable(true); - connect(analyserMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setAnalyserMode(int))); + connect(analyserMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setAnalyserMode(int))); analyserCache = NULL; winSkinVis = NULL; @@ -138,8 +138,8 @@ void GuiSpectrumAnalyser::setVisualizationMode(int mode) { if (!winSkinVis) { - winSkinVis=new WinSkinVis(TQT_TQOBJECT(this),"WinSkinVis"); - connect(winSkinVis,TQT_SIGNAL(doRepaint()),this,TQT_SLOT(updatePeaks())); + winSkinVis=new WinSkinVis(this,"WinSkinVis"); + connect(winSkinVis,TQ_SIGNAL(doRepaint()),this,TQ_SLOT(updatePeaks())); } } else diff --git a/noatun/modules/winskin/plugin.cpp b/noatun/modules/winskin/plugin.cpp index 8be9cc77..ff38a4ab 100644 --- a/noatun/modules/winskin/plugin.cpp +++ b/noatun/modules/winskin/plugin.cpp @@ -5,7 +5,7 @@ #include "waSkin.h" extern "C" { - KDE_EXPORT Plugin *create_plugin() { + TDE_EXPORT Plugin *create_plugin() { WaSkin *new_skin = new WaSkin(); new WinSkinConfig(new_skin, new_skin->skinManager()); return new_skin; diff --git a/noatun/modules/winskin/waBalanceSlider.cpp b/noatun/modules/winskin/waBalanceSlider.cpp index cb6b0f19..1503632b 100644 --- a/noatun/modules/winskin/waBalanceSlider.cpp +++ b/noatun/modules/winskin/waBalanceSlider.cpp @@ -38,10 +38,10 @@ void WaBalanceSlider::buildGui() ws->setValue(0); - connect(ws, TQT_SIGNAL(valueChanged(int)), this, - TQT_SIGNAL(balanceSetValue(int))); - connect(ws, TQT_SIGNAL(sliderPressed()), TQT_SIGNAL(sliderPressed())); - connect(ws, TQT_SIGNAL(sliderReleased()), TQT_SIGNAL(sliderReleased())); + connect(ws, TQ_SIGNAL(valueChanged(int)), this, + TQ_SIGNAL(balanceSetValue(int))); + connect(ws, TQ_SIGNAL(sliderPressed()), TQ_SIGNAL(sliderPressed())); + connect(ws, TQ_SIGNAL(sliderReleased()), TQ_SIGNAL(sliderReleased())); } diff --git a/noatun/modules/winskin/waDigit.cpp b/noatun/modules/winskin/waDigit.cpp index 3e953e6b..1feb3851 100644 --- a/noatun/modules/winskin/waDigit.cpp +++ b/noatun/modules/winskin/waDigit.cpp @@ -57,24 +57,24 @@ void WaDigit::paintEvent(TQPaintEvent *) // continue parsing mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_MINUS); if (len == 6) { - waSkinModel->getDigit('-', TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit('-', this, mapRect.x() - x, mapRect.y() - y); time++; } else { - waSkinModel->getDigit(' ', TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit(' ', this, mapRect.x() - x, mapRect.y() - y); } mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_1); - waSkinModel->getDigit(time[0], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit(time[0], this, mapRect.x() - x, mapRect.y() - y); mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_2); - waSkinModel->getDigit(time[1], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit(time[1], this, mapRect.x() - x, mapRect.y() - y); mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_3); - waSkinModel->getDigit(time[3], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit(time[3], this, mapRect.x() - x, mapRect.y() - y); mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_4); - waSkinModel->getDigit(time[4], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit(time[4], this, mapRect.x() - x, mapRect.y() - y); } void WaDigit::mousePressEvent(TQMouseEvent* e) { diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp index af64ecc2..1e55af78 100644 --- a/noatun/modules/winskin/waInfo.cpp +++ b/noatun/modules/winskin/waInfo.cpp @@ -25,8 +25,8 @@ WaInfo::WaInfo() : WaWidget(_WA_MAPPING_INFO) { - connect(WaSkinModel::instance(), TQT_SIGNAL(skinChanged()), - this, TQT_SLOT(pixmapChange())); + connect(WaSkinModel::instance(), TQ_SIGNAL(skinChanged()), + this, TQ_SLOT(pixmapChange())); completePixmap = new TQPixmap(); @@ -36,7 +36,7 @@ WaInfo::WaInfo() : WaWidget(_WA_MAPPING_INFO) xGrabbedPos = -1; timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeEvent())); + connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeEvent())); } WaInfo::~WaInfo() @@ -132,7 +132,7 @@ void WaInfo::pixmapChange() completePixmap->resize(TQMAX(n * _WA_TEXT_WIDTH, size.width()), _WA_TEXT_HEIGHT); for (i = 0; i < n; i++) { - WaSkinModel::instance()->getText(infoString[i], TQT_TQPAINTDEVICE(completePixmap), x, 0); + WaSkinModel::instance()->getText(infoString[i], completePixmap, x, 0); x += _WA_TEXT_WIDTH; } @@ -140,7 +140,7 @@ void WaInfo::pixmapChange() // fill the pixmap with spaces if (x < size.width()) { while (x < size.width()) { - WaSkinModel::instance()->getText(' ', TQT_TQPAINTDEVICE(completePixmap), x, 0); + WaSkinModel::instance()->getText(' ', completePixmap, x, 0); x += _WA_TEXT_WIDTH; } } diff --git a/noatun/modules/winskin/waJumpSlider.cpp b/noatun/modules/winskin/waJumpSlider.cpp index b8750dc1..f38fc3c3 100644 --- a/noatun/modules/winskin/waJumpSlider.cpp +++ b/noatun/modules/winskin/waJumpSlider.cpp @@ -30,9 +30,9 @@ void WaJumpSlider::buildGui() ws->setRange(0, 100); ws->setValue(0); - connect(ws, TQT_SIGNAL(sliderPressed()), this, TQT_SIGNAL(sliderPressed())); - connect(ws, TQT_SIGNAL(sliderReleased()), this, TQT_SLOT(releasedSlider())); - connect(ws, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(valueChanged(int))); + connect(ws, TQ_SIGNAL(sliderPressed()), this, TQ_SIGNAL(sliderPressed())); + connect(ws, TQ_SIGNAL(sliderReleased()), this, TQ_SLOT(releasedSlider())); + connect(ws, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(valueChanged(int))); } void WaJumpSlider::setJumpRange(int val) diff --git a/noatun/modules/winskin/waLabel.cpp b/noatun/modules/winskin/waLabel.cpp index 71f2baa2..7b452dac 100644 --- a/noatun/modules/winskin/waLabel.cpp +++ b/noatun/modules/winskin/waLabel.cpp @@ -19,8 +19,8 @@ WaLabel::WaLabel(int mapping) : WaWidget(mapping) { - connect(WaSkinModel::instance(), TQT_SIGNAL(skinChanged()), - this, TQT_SLOT(pixmapChange())); + connect(WaSkinModel::instance(), TQ_SIGNAL(skinChanged()), + this, TQ_SLOT(pixmapChange())); completePixmap = new TQPixmap(); @@ -58,7 +58,7 @@ void WaLabel::pixmapChange() int n = label_text ? strlen(label_text) : 0; for (int i = 0; i < n; i++) - WaSkinModel::instance()->getText(label_text[i], TQT_TQPAINTDEVICE(completePixmap), + WaSkinModel::instance()->getText(label_text[i], completePixmap, i * _WA_TEXT_WIDTH, 0); } diff --git a/noatun/modules/winskin/waRegion.cpp b/noatun/modules/winskin/waRegion.cpp index fdbad9af..d4285022 100644 --- a/noatun/modules/winskin/waRegion.cpp +++ b/noatun/modules/winskin/waRegion.cpp @@ -10,7 +10,7 @@ */ -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tqbitmap.h> #include <tqpainter.h> #include <tqregexp.h> @@ -28,7 +28,7 @@ const char *numPointsNames[] = {"NumPoints", "numpoints", "Numpoints", "numPoint WaRegion::WaRegion(TQString filename) { // Load the region file, which happens to be in TDEConfig format - KSimpleConfig regionFile(filename, true); + TDESimpleConfig regionFile(filename, true); // Clear our variables by default window_mask = 0; diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp index a9e68a2a..2127fda2 100644 --- a/noatun/modules/winskin/waSkin.cpp +++ b/noatun/modules/winskin/waSkin.cpp @@ -22,7 +22,7 @@ #include <kstdaction.h> #include <tdeaction.h> #include <tqdragobject.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <twin.h> #include <time.h> @@ -83,18 +83,18 @@ WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface() title_shaded = false; // These slots make Young Hickory love us - connect( napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) ); - connect( napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) ); - - connect(napp->player(), TQT_SIGNAL(playlistShown()), this, - TQT_SLOT(playlistShown())); - connect(napp->player(), TQT_SIGNAL(playlistHidden()), this, - TQT_SLOT(playlistHidden())); - connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, - TQT_SLOT(loopChange(int))); - connect(napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong())); - - connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(timetick())); + connect( napp, TQ_SIGNAL(hideYourself()), this, TQ_SLOT(hide()) ); + connect( napp, TQ_SIGNAL(showYourself()), this, TQ_SLOT(show()) ); + + connect(napp->player(), TQ_SIGNAL(playlistShown()), this, + TQ_SLOT(playlistShown())); + connect(napp->player(), TQ_SIGNAL(playlistHidden()), this, + TQ_SLOT(playlistHidden())); + connect(napp->player(), TQ_SIGNAL(loopTypeChange(int)), this, + TQ_SLOT(loopChange(int))); + connect(napp->player(), TQ_SIGNAL(newSong()), this, TQ_SLOT(newSong())); + + connect(napp->player(), TQ_SIGNAL(timeout()), this, TQ_SLOT(timetick())); TDEConfig *config=TDEGlobal::config(); config->setGroup("Winskin"); @@ -106,13 +106,13 @@ WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface() setIcon(SmallIcon("noatun")); - TQObject::connect(waTitleBar, TQT_SIGNAL(shaded()), this, TQT_SLOT(shadeEvent())); + TQObject::connect(waTitleBar, TQ_SIGNAL(shaded()), this, TQ_SLOT(shadeEvent())); // connect to players signals - so we can update our display if someone else // changes settings... - connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped())); - connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlaying())); - connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPaused())); + connect(napp->player(), TQ_SIGNAL(stopped()), this, TQ_SLOT(slotStopped())); + connect(napp->player(), TQ_SIGNAL(playing()), this, TQ_SLOT(slotPlaying())); + connect(napp->player(), TQ_SIGNAL(paused()), this, TQ_SLOT(slotPaused())); napp->player()->handleButtons(); @@ -180,22 +180,22 @@ void WaSkin::createButtons() menu = new WaButton(_WA_MAPPING_TITLE_MENU); menu->setPixmapUp(_WA_SKIN_TITLE_MENU_NORM); menu->setPixmapDown(_WA_SKIN_TITLE_MENU_PRES); - connect(menu, TQT_SIGNAL(clicked()), this, TQT_SLOT(menuEvent())); + connect(menu, TQ_SIGNAL(clicked()), this, TQ_SLOT(menuEvent())); minimize = new WaButton(_WA_MAPPING_TITLE_MIN); minimize->setPixmapUp(_WA_SKIN_TITLE_MIN_NORM); minimize->setPixmapDown(_WA_SKIN_TITLE_MIN_PRES); - connect(minimize, TQT_SIGNAL(clicked()), this, TQT_SLOT(minimizeEvent())); + connect(minimize, TQ_SIGNAL(clicked()), this, TQ_SLOT(minimizeEvent())); titleshade = new WaButton(_WA_MAPPING_TITLE_SHADE); titleshade->setPixmapUp(_WA_SKIN_TITLE_SHADE_NORM); titleshade->setPixmapDown(_WA_SKIN_TITLE_SHADE_PRES); - connect(titleshade, TQT_SIGNAL(clicked()), this, TQT_SLOT(shadeEvent())); + connect(titleshade, TQ_SIGNAL(clicked()), this, TQ_SLOT(shadeEvent())); close = new WaButton(_WA_MAPPING_TITLE_CLOSE); close->setPixmapUp(_WA_SKIN_TITLE_CLOSE_NORM); close->setPixmapDown(_WA_SKIN_TITLE_CLOSE_PRES); - connect(close, TQT_SIGNAL(clicked()), this, TQT_SLOT(doClose())); + connect(close, TQ_SIGNAL(clicked()), this, TQ_SLOT(doClose())); shuffle->setTogglable(true); shuffle->show(); @@ -203,44 +203,44 @@ void WaSkin::createButtons() repeat->setTogglable(true); playlist->setTogglable(true); - connect(shuffle, TQT_SIGNAL(toggleEvent(bool)), - this, TQT_SLOT(shuffleClickedEvent(bool))); + connect(shuffle, TQ_SIGNAL(toggleEvent(bool)), + this, TQ_SLOT(shuffleClickedEvent(bool))); - connect(repeat, TQT_SIGNAL(toggleEvent(bool)), - this, TQT_SLOT(repeatClickedEvent(bool))); + connect(repeat, TQ_SIGNAL(toggleEvent(bool)), + this, TQ_SLOT(repeatClickedEvent(bool))); - connect(playlist, TQT_SIGNAL(toggleEvent(bool)), - this, TQT_SLOT(playlistClickedEvent(bool))); + connect(playlist, TQ_SIGNAL(toggleEvent(bool)), + this, TQ_SLOT(playlistClickedEvent(bool))); - connect(eq, TQT_SIGNAL(clicked()), - this, TQT_SLOT(eqClickedEvent())); + connect(eq, TQ_SIGNAL(clicked()), + this, TQ_SLOT(eqClickedEvent())); prev->setPixmapUp(_WA_SKIN_CBUTTONS_PREV_NORM); prev->setPixmapDown(_WA_SKIN_CBUTTONS_PREV_PRES); - connect(prev, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back())); + connect(prev, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(back())); play->setPixmapUp(_WA_SKIN_CBUTTONS_PLAY_NORM); play->setPixmapDown(_WA_SKIN_CBUTTONS_PLAY_PRES); - connect(play, TQT_SIGNAL(clicked()), this, TQT_SLOT(playCurrentEvent())); + connect(play, TQ_SIGNAL(clicked()), this, TQ_SLOT(playCurrentEvent())); pause->setPixmapUp(_WA_SKIN_CBUTTONS_PAUSE_NORM); pause->setPixmapDown(_WA_SKIN_CBUTTONS_PAUSE_PRES); - connect(pause, TQT_SIGNAL(clicked()), this, TQT_SLOT(playPauseEvent())); + connect(pause, TQ_SIGNAL(clicked()), this, TQ_SLOT(playPauseEvent())); stop->setPixmapUp(_WA_SKIN_CBUTTONS_STOP_NORM); stop->setPixmapDown(_WA_SKIN_CBUTTONS_STOP_PRES); - connect(stop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop())); + connect(stop, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(stop())); next->setPixmapUp(_WA_SKIN_CBUTTONS_NEXT_NORM); next->setPixmapDown(_WA_SKIN_CBUTTONS_NEXT_PRES); - connect(next, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward())); + connect(next, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(forward())); eject->setPixmapUp(_WA_SKIN_CBUTTONS_EJECT_NORM); eject->setPixmapDown(_WA_SKIN_CBUTTONS_EJECT_PRESS); - connect(eject, TQT_SIGNAL(clicked()), napp, TQT_SLOT(fileOpen())); + connect(eject, TQ_SIGNAL(clicked()), napp, TQ_SLOT(fileOpen())); shuffle->setPixmapUp(_WA_SKIN_SHUFREP_SHUFFLE_NOT_SET_NORM); shuffle->setPixmapDown(_WA_SKIN_SHUFREP_SHUFFLE_NOT_SET_PRES); @@ -280,25 +280,25 @@ void WaSkin::createHighLevelElements() waVolumeSlider = new WaVolumeSlider(); waVolumeSlider->buildGui(); - connect(waVolumeSlider, TQT_SIGNAL(volumeSetValue(int)), - this, TQT_SLOT(volumeSetValue(int))); - connect(waVolumeSlider, TQT_SIGNAL(sliderPressed()), - this, TQT_SLOT(volumeSliderPressed())); - connect(waVolumeSlider, TQT_SIGNAL(sliderReleased()), - this, TQT_SLOT(volumeSliderReleased())); + connect(waVolumeSlider, TQ_SIGNAL(volumeSetValue(int)), + this, TQ_SLOT(volumeSetValue(int))); + connect(waVolumeSlider, TQ_SIGNAL(sliderPressed()), + this, TQ_SLOT(volumeSliderPressed())); + connect(waVolumeSlider, TQ_SIGNAL(sliderReleased()), + this, TQ_SLOT(volumeSliderReleased())); waBalanceSlider = new WaBalanceSlider(); waBalanceSlider->buildGui(); - connect(waBalanceSlider, TQT_SIGNAL(balanceSetValue(int)), - this, TQT_SLOT(balanceSetValue(int))); - connect(waBalanceSlider, TQT_SIGNAL(sliderPressed()), - this, TQT_SLOT(balanceSliderPressed())); - connect(waBalanceSlider, TQT_SIGNAL(sliderReleased()), - this, TQT_SLOT(balanceSliderReleased())); + connect(waBalanceSlider, TQ_SIGNAL(balanceSetValue(int)), + this, TQ_SLOT(balanceSetValue(int))); + connect(waBalanceSlider, TQ_SIGNAL(sliderPressed()), + this, TQ_SLOT(balanceSliderPressed())); + connect(waBalanceSlider, TQ_SIGNAL(sliderReleased()), + this, TQ_SLOT(balanceSliderReleased())); waDigit = new WaDigit(); - connect(waDigit, TQT_SIGNAL(digitsClicked()), this, TQT_SLOT(digitsClicked())); + connect(waDigit, TQ_SIGNAL(digitsClicked()), this, TQ_SLOT(digitsClicked())); waBPS = new WaLabel(_WA_MAPPING_BPS); waFreq = new WaLabel(_WA_MAPPING_FREQ); @@ -310,13 +310,13 @@ void WaSkin::createHighLevelElements() waStereo = new WaIndicator(_WA_MAPPING_MONOSTER_STEREO, _WA_SKIN_MONOSTER_STEREO_TRUE, _WA_SKIN_MONOSTER_STEREO_FALSE); waMono = new WaIndicator(_WA_MAPPING_MONOSTER_MONO, _WA_SKIN_MONOSTER_MONO_TRUE, _WA_SKIN_MONOSTER_MONO_FALSE); - connect(waJumpSlider, TQT_SIGNAL(jump(int)), this, TQT_SLOT(jump(int))); - connect(waJumpSlider, TQT_SIGNAL(sliderPressed()), - this, TQT_SLOT(jumpSliderPressed())); - connect(waJumpSlider, TQT_SIGNAL(sliderReleased()), - this, TQT_SLOT(jumpSliderReleased())); - connect(waJumpSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(jumpValueChanged(int))); + connect(waJumpSlider, TQ_SIGNAL(jump(int)), this, TQ_SLOT(jump(int))); + connect(waJumpSlider, TQ_SIGNAL(sliderPressed()), + this, TQ_SLOT(jumpSliderPressed())); + connect(waJumpSlider, TQ_SIGNAL(sliderReleased()), + this, TQ_SLOT(jumpSliderReleased())); + connect(waJumpSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(jumpValueChanged(int))); } @@ -518,7 +518,7 @@ void WaSkin::doUnload() { } void WaSkin::doClose() { - TQTimer::singleShot(0, this, TQT_SLOT(doUnload())); + TQTimer::singleShot(0, this, TQ_SLOT(doUnload())); } void WaSkin::dragEnterEvent(TQDragEnterEvent * event) diff --git a/noatun/modules/winskin/waSkinManager.cpp b/noatun/modules/winskin/waSkinManager.cpp index 3363292c..99c2df99 100644 --- a/noatun/modules/winskin/waSkinManager.cpp +++ b/noatun/modules/winskin/waSkinManager.cpp @@ -1,7 +1,7 @@ #include <tdeglobal.h> #include <tqfileinfo.h> #include <tqregexp.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqdir.h> #include <kdebug.h> #include <kmimetype.h> @@ -73,7 +73,7 @@ bool WaSkinManager::installSkin(TQString _url) { if (mimetype == "inode/directory") { TDEIO::Job *job = TDEIO::copy(url, location, !url.isLocalFile()); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SIGNAL(updateSkinList())); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SIGNAL(updateSkinList())); return true; } else if ((mimetype == "interface/x-winamp-skin") || (mimetype == "application/x-zip")) @@ -84,7 +84,7 @@ bool WaSkinManager::installSkin(TQString _url) { TQString base_path; base_path = location + "/" + TQFileInfo(url.path()).baseName().replace(TQRegExp("_"), " "); TDEIO::Job *job = TDEIO::copy("zip:" + url.path(), base_path); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SIGNAL(updateSkinList())); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SIGNAL(updateSkinList())); return true; } @@ -99,7 +99,7 @@ bool WaSkinManager::removeSkin(TQString skinName) { TQStringList skins = TDEGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); TDEIO::Job *job = TDEIO::del(KURL(skins[0]), false, false); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SIGNAL(updateSkinList())); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SIGNAL(updateSkinList())); return true; } diff --git a/noatun/modules/winskin/waSkinModel.cpp b/noatun/modules/winskin/waSkinModel.cpp index 88c1f460..188c16be 100644 --- a/noatun/modules/winskin/waSkinModel.cpp +++ b/noatun/modules/winskin/waSkinModel.cpp @@ -17,7 +17,7 @@ #include <tqstringlist.h> #include <tqbitmap.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "waSkinMapping.h" #include "waShadeMapping.h" diff --git a/noatun/modules/winskin/waVolumeSlider.cpp b/noatun/modules/winskin/waVolumeSlider.cpp index f61e22f1..712e974d 100644 --- a/noatun/modules/winskin/waVolumeSlider.cpp +++ b/noatun/modules/winskin/waVolumeSlider.cpp @@ -33,10 +33,10 @@ void WaVolumeSlider::buildGui() ws->setPixmapSliderButtonDown(_WA_SKIN_VOLUME_SLIDER_PRES); ws->setPixmapSliderBar(_WA_SKIN_VOLUME_BAR); - connect(ws, TQT_SIGNAL(valueChanged(int)), this, - TQT_SIGNAL(volumeSetValue(int))); - connect(ws, TQT_SIGNAL(sliderPressed()), TQT_SIGNAL(sliderPressed())); - connect(ws, TQT_SIGNAL(sliderReleased()), TQT_SIGNAL(sliderReleased())); + connect(ws, TQ_SIGNAL(valueChanged(int)), this, + TQ_SIGNAL(volumeSetValue(int))); + connect(ws, TQ_SIGNAL(sliderPressed()), TQ_SIGNAL(sliderPressed())); + connect(ws, TQ_SIGNAL(sliderReleased()), TQ_SIGNAL(sliderReleased())); } void WaVolumeSlider::setVolumeValue(int val) diff --git a/noatun/modules/winskin/waWidget.cpp b/noatun/modules/winskin/waWidget.cpp index 69f797f5..b8c4b1ac 100644 --- a/noatun/modules/winskin/waWidget.cpp +++ b/noatun/modules/winskin/waWidget.cpp @@ -6,7 +6,7 @@ WaWidget::WaWidget(int _mapping) : TQWidget(WaSkin::instance()) { mapping = _mapping; setBackgroundMode(NoBackground); - connect (WaSkinModel::instance(), TQT_SIGNAL(skinChanged()), this, TQT_SLOT(skinChanged())); + connect (WaSkinModel::instance(), TQ_SIGNAL(skinChanged()), this, TQ_SLOT(skinChanged())); } WaWidget::~WaWidget() { @@ -14,31 +14,31 @@ WaWidget::~WaWidget() { void WaWidget::paintPixmap(int pixmap_mapping) { if (pixmap_mapping != -1) - WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), 0, 0); + WaSkinModel::instance()->bltTo(pixmap_mapping, this, 0, 0); else - WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), 0, 0); + WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0); } void WaWidget::paintPixmap(int pixmap_mapping, int x, int y) { if (pixmap_mapping != -1) - WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), x, y); + WaSkinModel::instance()->bltTo(pixmap_mapping, this, x, y); else - WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), x, y); + WaSkinModel::instance()->paintBackgroundTo(mapping, this, x, y); } void WaWidget::paintPixmap(int pixmap_mapping, int argument) { if (pixmap_mapping != -1) - WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), 0, 0, argument); + WaSkinModel::instance()->bltTo(pixmap_mapping, this, 0, 0, argument); else - WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), 0, 0); + WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0); } void WaWidget::paintPixmap(int pixmap_mapping, int argument, int x, int y) { if (pixmap_mapping != -1) - WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), x, y, argument); + WaSkinModel::instance()->bltTo(pixmap_mapping, this, x, y, argument); else - WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), x, y); + WaSkinModel::instance()->paintBackgroundTo(mapping, this, x, y); } TQSize WaWidget::sizeHint() { diff --git a/noatun/modules/winskin/waWidget.h b/noatun/modules/winskin/waWidget.h index 81f12f14..3f2f018a 100644 --- a/noatun/modules/winskin/waWidget.h +++ b/noatun/modules/winskin/waWidget.h @@ -19,7 +19,7 @@ public: void paintPixmap(int wa_mapping, int x, int y); void paintPixmap(int wa_mapping, int number, int x, int y); - void paintBackground() { WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), 0, 0); } + void paintBackground() { WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0); } protected: void mousePressEvent(TQMouseEvent *); diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp index 961ed457..03e469f1 100644 --- a/noatun/modules/winskin/winSkinConfig.cpp +++ b/noatun/modules/winskin/winSkinConfig.cpp @@ -13,7 +13,7 @@ #include <tdefile.h> #include <tdefiledialog.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurlrequester.h> #include <kurlrequesterdlg.h> #include <tqdir.h> @@ -27,7 +27,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) : CModule(i18n("Winskin"), i18n("Skin Selection for the Winskin Plugin"), "style", - TQT_TQOBJECT(parent)) + parent) { // Make a token horizontal layout box vbox = new TQVBoxLayout(this); @@ -48,10 +48,10 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) : hbox->addWidget(buttonRemove); vbox->addLayout(hbox); - connect( skin_list, TQT_SIGNAL(highlighted(const TQString &)), this, TQT_SLOT(selected())); - connect( buttonInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(install())); - connect( buttonRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove())); - connect(waSkinManager, TQT_SIGNAL(updateSkinList()), this, TQT_SLOT(reopen())); + connect( skin_list, TQ_SIGNAL(highlighted(const TQString &)), this, TQ_SLOT(selected())); + connect( buttonInstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(install())); + connect( buttonRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(remove())); + connect(waSkinManager, TQ_SIGNAL(updateSkinList()), this, TQ_SLOT(reopen())); mWaSkinManager = waSkinManager; diff --git a/tdefile-plugins/CMakeLists.txt b/tdefile-plugins/CMakeLists.txt index 526e203e..09856785 100644 --- a/tdefile-plugins/CMakeLists.txt +++ b/tdefile-plugins/CMakeLists.txt @@ -14,6 +14,7 @@ add_subdirectory( avi ) tde_conditional_add_subdirectory( WITH_TAGLIB flac ) add_subdirectory( m3u ) tde_conditional_add_subdirectory( WITH_TAGLIB mp3 ) +tde_conditional_add_subdirectory( WITH_TAGLIB mp4 ) tde_conditional_add_subdirectory( HAVE_TAGLIB_MPC_H mpc ) add_subdirectory( mpeg ) tde_conditional_add_subdirectory( WITH_VORBIS ogg ) diff --git a/tdefile-plugins/au/tdefile_au.cpp b/tdefile-plugins/au/tdefile_au.cpp index 296a91d7..5b474ee4 100644 --- a/tdefile-plugins/au/tdefile_au.cpp +++ b/tdefile-plugins/au/tdefile_au.cpp @@ -20,7 +20,7 @@ #include <config.h> #include "tdefile_au.h" -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> #include <kgenericfactory.h> #include <kstringvalidator.h> @@ -32,12 +32,7 @@ #include <tqfile.h> #include <tqdatetime.h> -#if !defined(__osf__) #include <inttypes.h> -#else -typedef unsigned long uint32_t; -typedef unsigned short uint16_t; -#endif typedef KGenericFactory<KAuPlugin> AuFactory; diff --git a/tdefile-plugins/avi/tdefile_avi.cpp b/tdefile-plugins/avi/tdefile_avi.cpp index 03866369..38a8e23b 100644 --- a/tdefile-plugins/avi/tdefile_avi.cpp +++ b/tdefile-plugins/avi/tdefile_avi.cpp @@ -21,7 +21,7 @@ #include <config.h> #include "tdefile_avi.h" -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> #include <kgenericfactory.h> #include <kstringvalidator.h> @@ -33,13 +33,7 @@ #include <tqfile.h> #include <tqdatetime.h> -#if !defined(__osf__) #include <inttypes.h> -#else -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; -typedef unsigned long long uint64_t; -#endif typedef KGenericFactory<KAviPlugin> AviFactory; diff --git a/tdefile-plugins/avi/tdefile_avi.h b/tdefile-plugins/avi/tdefile_avi.h index f6718bff..e0d98bdf 100644 --- a/tdefile-plugins/avi/tdefile_avi.h +++ b/tdefile-plugins/avi/tdefile_avi.h @@ -23,13 +23,7 @@ #include <tdefilemetainfo.h> #include <tqfile.h> -#if !defined(__osf__) #include <inttypes.h> -#else -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; -#endif - class TQStringList; diff --git a/tdefile-plugins/flac/tdefile_flac.cpp b/tdefile-plugins/flac/tdefile_flac.cpp index 808af9c9..207e3928 100644 --- a/tdefile-plugins/flac/tdefile_flac.cpp +++ b/tdefile-plugins/flac/tdefile_flac.cpp @@ -32,12 +32,13 @@ #include <kdebug.h> #include <kurl.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> #include <kgenericfactory.h> #include <ksavefile.h> #include <tag.h> +#include <taglib.h> #if (TAGLIB_MAJOR_VERSION>1) || \ ((TAGLIB_MAJOR_VERSION==1) && (TAGLIB_MINOR_VERSION>=2)) #define TAGLIB_1_2 @@ -200,7 +201,7 @@ bool KFlacPlugin::readInfo( KFileMetaInfo& info, uint what ) appendItem(techgroup, "Bitrate", properties->bitrate()); appendItem(techgroup, "Sample Rate", properties->sampleRate()); - appendItem(techgroup, "Sample Width", properties->sampleWidth()); + appendItem(techgroup, "Sample Width", properties->bitsPerSample()); appendItem(techgroup, "Channels", properties->channels()); appendItem(techgroup, "Length", properties->length()); } @@ -234,7 +235,7 @@ bool KFlacPlugin::writeInfo(const KFileMetaInfo& info) const { TagLib::File *file; - if (!TagLib::File::isWritable(TQFile::encodeName(info.path()).data())) { + if (access(info.path().local8Bit().data(), R_OK|W_OK)) { kdDebug(7034) << "can't write to " << info.path() << endl; return false; } diff --git a/tdefile-plugins/m3u/tdefile_m3u.cpp b/tdefile-plugins/m3u/tdefile_m3u.cpp index 7e0aad18..c5772b79 100644 --- a/tdefile-plugins/m3u/tdefile_m3u.cpp +++ b/tdefile-plugins/m3u/tdefile_m3u.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> #include <kurl.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> #include <kgenericfactory.h> diff --git a/tdefile-plugins/mp3/tdefile_mp3.cpp b/tdefile-plugins/mp3/tdefile_mp3.cpp index 742f0759..460492b2 100644 --- a/tdefile-plugins/mp3/tdefile_mp3.cpp +++ b/tdefile-plugins/mp3/tdefile_mp3.cpp @@ -22,7 +22,7 @@ #include "tdefile_mp3.h" -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> #include <kgenericfactory.h> #include <kstringvalidator.h> @@ -237,7 +237,7 @@ bool KMp3Plugin::writeInfo(const KFileMetaInfo &info) const TagLib::ID3v2::FrameFactory::instance()->setDefaultTextEncoding(TagLib::String::UTF8); TagLib::MPEG::File file(TQFile::encodeName(info.path()).data(), false); - if(!file.isOpen() || !TagLib::File::isWritable(file.name())) + if(!file.isOpen() || access(info.path().local8Bit().data(), R_OK|W_OK)) { kdDebug(7034) << "couldn't open " << info.path() << endl; return false; diff --git a/tdefile-plugins/mp4/CMakeL10n.txt b/tdefile-plugins/mp4/CMakeL10n.txt new file mode 100644 index 00000000..aa8be462 --- /dev/null +++ b/tdefile-plugins/mp4/CMakeL10n.txt @@ -0,0 +1,3 @@ +##### create translation templates ############## + +tde_l10n_create_template( "tdefile_mp4" ) diff --git a/tdefile-plugins/mp4/CMakeLists.txt b/tdefile-plugins/mp4/CMakeLists.txt new file mode 100644 index 00000000..17e388ac --- /dev/null +++ b/tdefile-plugins/mp4/CMakeLists.txt @@ -0,0 +1,42 @@ +################################################# +# +# (C) 2025 mio <stigma@disroot.org> +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${TAGLIB_INCLUDE_DIRS} + ${TQT_INCLUDE_DIRS} + ${TDE_INCLUDE_DIR} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### tdefile_mp4 (module) ###################### + +tde_add_kpart( tdefile_mp4 AUTOMOC + SOURCES + tdefile_mp4.cpp + LINK + DCOP-shared tdecore-shared tdeui-shared tdefx-shared tdeio-shared + tdetexteditor-shared ${TAGLIB_LIBRARIES} + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data ################################ + +tde_create_translated_desktop( + SOURCE tdefile_mp4.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR tdefile-desktops +) diff --git a/tdefile-plugins/mp4/tdefile_mp4.cpp b/tdefile-plugins/mp4/tdefile_mp4.cpp new file mode 100644 index 00000000..04291b2d --- /dev/null +++ b/tdefile-plugins/mp4/tdefile_mp4.cpp @@ -0,0 +1,276 @@ +/* This file is part of the TDE project + * Copyright (C) 2025 mio <stigma@disroot.org> + * + * Portions of code based off tdefile_mp3.cpp + * Copyright (C) 2001, 2002 Rolf Magnus <ramagnus@kde.org> + * Copyright (C) 2002 Ryan Cumming <bodnar42@phalynx.dhs.org> + * Copyright (C) 2003 Scott Wheeler <wheeler@kde.org> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ +#include "config.h" +#include "tdefile_mp4.h" + +// TQt +#include <tqfile.h> + +// TDE +#include <kgenericfactory.h> +#include <kstringvalidator.h> + +// TagLib +#include <id3v1genres.h> +#include <id3v2tag.h> +#include <mp4file.h> +#include <tfilestream.h> +#include <tpropertymap.h> +#include <tstring.h> + +#define TStringToTQString(s) TQString::fromUtf8(s.toCString(true)) + +using Mp4Factory = KGenericFactory<TDEMp4Plugin>; + +K_EXPORT_COMPONENT_FACTORY(tdefile_mp4, Mp4Factory("tdefile_mp4")) + +/** + * Do translation between KFileMetaInfo items and TagLib::String in a tidy way. + */ +class Translator +{ +public: + Translator(const KFileMetaInfo &info) : m_info(info) {} + + TagLib::String operator[](const char *key) const + { + return QStringToTString(m_info["id3"][key].value().toString()); + } + + int toInt(const char *key) const + { + return m_info["id3"][key].value().toInt(); + } + +private: + const KFileMetaInfo &m_info; +}; + +class Validator : public KStringListValidator +{ +public: + Validator(const TQStringList& list, bool rejecting, bool fixupEnabled, + TQObject *parent, const char *name) + : KStringListValidator(list, rejecting, fixupEnabled, parent, name) + { + + } + + TQValidator::State validate(TQString&, int&) const override + { + return TQValidator::Acceptable; + } +}; + +TDEMp4Plugin::TDEMp4Plugin(TQObject *parent, const char *name, const TQStringList& args) + : KFilePlugin(parent, name, args) +{ + KFileMimeTypeInfo *info = addMimeTypeInfo(name); + + // ID3 group + KFileMimeTypeInfo::GroupInfo *group = addGroupInfo(info, "id3", i18n("ID3 Tag")); + setAttributes(group, KFileMimeTypeInfo::Addable | KFileMimeTypeInfo::Removable); + + KFileMimeTypeInfo::ItemInfo *item; + + item = addItemInfo(group, "Title", i18n("Title"), TQVariant::String); + setAttributes(item, KFileMimeTypeInfo::Modifiable); + setHint(item, KFileMimeTypeInfo::Name); + + item = addItemInfo(group, "Artist", i18n("Artist"), TQVariant::String); + setAttributes(item, KFileMimeTypeInfo::Modifiable); + setHint(item, KFileMimeTypeInfo::Author); + + item = addItemInfo(group, "Album", i18n("Album"), TQVariant::String); + setAttributes(item, KFileMimeTypeInfo::Modifiable); + + item = addItemInfo(group, "Date", i18n("Year"), TQVariant::String); + setAttributes(item, KFileMimeTypeInfo::Modifiable); + + item = addItemInfo(group, "Comment", i18n("Comment"), TQVariant::String); + setAttributes(item, KFileMimeTypeInfo::Modifiable); + setHint(item, KFileMimeTypeInfo::Description); + + item = addItemInfo(group, "Tracknumber", i18n("Track"), TQVariant::Int); + setAttributes(item, KFileMimeTypeInfo::Modifiable); + + item = addItemInfo(group, "Genre", i18n("Genre"), TQVariant::String); + setAttributes(item, KFileMimeTypeInfo::Modifiable); + + // Technical group. + group = addGroupInfo(info, "Technical", i18n("Technical Details")); + + item = addItemInfo(group, "Length", i18n("Length"), TQVariant::Int); + setAttributes(item, KFileMimeTypeInfo::Cummulative); + setUnit(item, KFileMimeTypeInfo::Seconds); + + item = addItemInfo(group, "Bitrate", i18n("Average Bitrate"), TQVariant::Int); + setAttributes(item, KFileMimeTypeInfo::Averaged); + setHint(item, KFileMimeTypeInfo::Bitrate); + setSuffix(item, i18n(" kbps")); + + item = addItemInfo(group, "Sample Rate", i18n("Sample Rate"), TQVariant::Int); + setSuffix(item, i18n("Hz")); + + item = addItemInfo(group, "Channels", i18n("Channels"), TQVariant::Int); +} + +TQValidator* TDEMp4Plugin::createValidator(const TQString& mimeType, const TQString& group, + const TQString& key, TQObject *parent, const char* name) const +{ + if (key == "Tracknumber" || key == "Date") + { + return new TQIntValidator(0, 9999, parent, name); + } + + if (key == "Genre") + { + TQStringList genres; + for (const auto& genre : TagLib::ID3v1::genreList()) + { + genres.append(TStringToTQString(genre)); + } + + return new Validator(genres, false, true, parent, name); + } + + return nullptr; +} + +bool TDEMp4Plugin::readInfo(KFileMetaInfo& info, unsigned what) +{ + using What = KFileMetaInfo::What; + + bool readID3 = false; + bool readTech = false; + + if (what & (What::Fastest | What::DontCare | What::ContentInfo)) + { + readID3 = true; + } + + if (what & (What::Fastest | What::DontCare | What::TechnicalInfo)) + { + readTech = true; + } + + if (!readID3 && !readTech) + { + return true; + } + + if (info.path().isNull()) + { + // Remote file. + return false; + } + + TagLib::MP4::File file(TQFile::encodeName(info.path()), readTech); + + if (!file.isOpen()) + { + kdWarning(7034) << "Could not open " << file.name() << endl; + return false; + } + + if (readID3) + { + KFileMetaInfoGroup id3group = appendGroup(info, "id3"); + const TagLib::MP4::Tag* tag = file.tag(); + + if (!tag->title().isEmpty()) + { + appendItem(id3group, "Title", TStringToTQString(tag->title()).stripWhiteSpace()); + } + if (!tag->artist().isEmpty()) + { + appendItem(id3group, "Artist", TStringToTQString(tag->artist()).stripWhiteSpace()); + } + if (!tag->album().isEmpty()) + { + appendItem(id3group, "Album", TStringToTQString(tag->album()).stripWhiteSpace()); + } + if (!tag->comment().isEmpty()) + { + appendItem(id3group, "Comment", TStringToTQString(tag->comment()).stripWhiteSpace()); + } + if (!tag->genre().isEmpty()) + { + appendItem(id3group, "Genre", TStringToTQString(tag->genre()).stripWhiteSpace()); + } + + TQString date = (tag->year() > 0) ? TQString::number(tag->year()) : TQString::null; + TQString track = (tag->track() > 0) ? TQString::number(tag->track()) : TQString::null; + + appendItem(id3group, "Date", date); + appendItem(id3group, "Tracknumber", track); + } + + if (readTech) + { + KFileMetaInfoGroup techGroup = appendGroup(info, "Technical"); + const TagLib::AudioProperties* audioProperties = file.audioProperties(); + + appendItem(techGroup, "Length", audioProperties->lengthInSeconds()); + appendItem(techGroup, "Bitrate", audioProperties->bitrate()); + appendItem(techGroup, "Sample Rate", audioProperties->sampleRate()); + appendItem(techGroup, "Channels", audioProperties->channels()); + } + + return true; +} + +bool TDEMp4Plugin::writeInfo(const KFileMetaInfo& info) const +{ + TagLib::ID3v2::FrameFactory::instance()->setDefaultTextEncoding(TagLib::String::UTF8); + TagLib::FileStream stream(TQFile::encodeName(info.path()), false); + + if (!stream.isOpen() || stream.readOnly()) + { + kdDebug(7034) << "couldn't open " << info.path() << " for writing" << endl; + return false; + } + + TagLib::MP4::File file(&stream, false); + + if (!file.isValid()) + { + return false; + } + + Translator t(info); + + file.tag()->setTitle(t["Title"]); + file.tag()->setArtist(t["Artist"]); + file.tag()->setAlbum(t["Album"]); + file.tag()->setYear(t.toInt("Date")); + file.tag()->setComment(t["Comment"]); + file.tag()->setTrack(t.toInt("Tracknumber")); + file.tag()->setGenre(t["Genre"]); + + file.save(); + + return true; +} + +#include "tdefile_mp4.moc" diff --git a/tdefile-plugins/mp4/tdefile_mp4.desktop b/tdefile-plugins/mp4/tdefile_mp4.desktop new file mode 100644 index 00000000..7730b871 --- /dev/null +++ b/tdefile-plugins/mp4/tdefile_mp4.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Service +Name=MP4 Info +X-TDE-ServiceTypes=KFilePlugin +X-TDE-Library=tdefile_mp4 +MimeType=audio/mp4 +PreferredGroups=id3,Technical +PreferredItems=Title,Artist,Album,Genre,Date,Tracknumber,Length,Comment,Bitrate,Sample Rate,Channels diff --git a/tdefile-plugins/mp4/tdefile_mp4.h b/tdefile-plugins/mp4/tdefile_mp4.h new file mode 100644 index 00000000..16e9b65a --- /dev/null +++ b/tdefile-plugins/mp4/tdefile_mp4.h @@ -0,0 +1,39 @@ +/* This file is part of the TDE project + * Copyright (C) 2025 mio <stigma@disroot.org> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ +#ifndef __TDEFILE_MP4_H__ +#define __TDEFILE_MP4_H__ + +#include <tdefilemetainfo.h> + +class TQStringList; + +class TDEMp4Plugin : public KFilePlugin +{ + TQ_OBJECT + +public: + TDEMp4Plugin(TQObject *parent, const char *name, const TQStringList& meta); + + TQValidator* createValidator(const TQString& mimeType, const TQString& group, + const TQString& key, TQObject *parent, const char* name) const override; + + bool readInfo(KFileMetaInfo& info, unsigned what) override; + bool writeInfo(const KFileMetaInfo& info) const override; +}; + +#endif /* __TDEFILE_MP4_H__ */ diff --git a/tdefile-plugins/mpc/tdefile_mpc.cpp b/tdefile-plugins/mpc/tdefile_mpc.cpp index 238307f1..b239ad69 100644 --- a/tdefile-plugins/mpc/tdefile_mpc.cpp +++ b/tdefile-plugins/mpc/tdefile_mpc.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> #include <kurl.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> #include <kgenericfactory.h> #include <ksavefile.h> @@ -210,7 +210,7 @@ bool KMpcPlugin::writeInfo(const KFileMetaInfo& info) const { TagLib::File *file; - if (!TagLib::File::isWritable(TQFile::encodeName(info.path()).data())) { + if (access(info.path().local8Bit().data(), R_OK|W_OK)) { kdDebug(7034) << "can't write to " << info.path() << endl; return false; } diff --git a/tdefile-plugins/mpeg/tdefile_mpeg.cpp b/tdefile-plugins/mpeg/tdefile_mpeg.cpp index f32c1576..8ab2a5cf 100644 --- a/tdefile-plugins/mpeg/tdefile_mpeg.cpp +++ b/tdefile-plugins/mpeg/tdefile_mpeg.cpp @@ -24,7 +24,7 @@ #include <config.h> #include "tdefile_mpeg.h" -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> #include <kgenericfactory.h> #include <kstringvalidator.h> diff --git a/tdefile-plugins/ogg/tdefile_ogg.cpp b/tdefile-plugins/ogg/tdefile_ogg.cpp index bf1cbf94..fc73cff4 100644 --- a/tdefile-plugins/ogg/tdefile_ogg.cpp +++ b/tdefile-plugins/ogg/tdefile_ogg.cpp @@ -30,7 +30,7 @@ #include <kdebug.h> #include <kurl.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> #include <kgenericfactory.h> #include <ksavefile.h> diff --git a/tdefile-plugins/wav/tdefile_wav.cpp b/tdefile-plugins/wav/tdefile_wav.cpp index d0057b42..31b72f1f 100644 --- a/tdefile-plugins/wav/tdefile_wav.cpp +++ b/tdefile-plugins/wav/tdefile_wav.cpp @@ -20,7 +20,7 @@ #include <config.h> #include "tdefile_wav.h" -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> #include <kgenericfactory.h> #include <kstringvalidator.h> @@ -32,12 +32,7 @@ #include <tqfile.h> #include <tqdatetime.h> -#if !defined(__osf__) #include <inttypes.h> -#else -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; -#endif typedef KGenericFactory<KWavPlugin> WavFactory; diff --git a/tdeioslave/audiocd/audiocd.cpp b/tdeioslave/audiocd/audiocd.cpp index efd7dc14..8116f4e7 100644 --- a/tdeioslave/audiocd/audiocd.cpp +++ b/tdeioslave/audiocd/audiocd.cpp @@ -30,8 +30,8 @@ extern "C" #include <cdda_paranoia.h> void paranoiaCallback(long, int); - #include <kdemacros.h> - KDE_EXPORT int kdemain(int argc, char ** argv); + #include <tdemacros.h> + TDE_EXPORT int kdemain(int argc, char ** argv); } #include "audiocd.h" @@ -75,7 +75,7 @@ static const TDECmdLineOptions options[] = int kdemain(int argc, char ** argv) { - // TDEApplication uses libkcddb which needs a valid kapp pointer + // TDEApplication uses libkcddb which needs a valid tdeApp pointer // GUIenabled must be true as libkcddb sometimes wants to communicate // with the user TDEApplication::disableAutoDcopRegistration(); diff --git a/tdeioslave/audiocd/kcmaudiocd/audiocdconfig.ui b/tdeioslave/audiocd/kcmaudiocd/audiocdconfig.ui index 25a6d6f5..fba43890 100644 --- a/tdeioslave/audiocd/kcmaudiocd/audiocdconfig.ui +++ b/tdeioslave/audiocd/kcmaudiocd/audiocdconfig.ui @@ -619,8 +619,8 @@ <include location="global" impldecl="in declaration">tdecmodule.h</include> <include location="global" impldecl="in implementation">klineedit.h</include> </includes> -<Q_SLOTS> +<slots> <slot>toggleLowpass()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp index 1954422c..a0dcf468 100644 --- a/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp +++ b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp @@ -62,25 +62,25 @@ KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name) TDEConfigDialogManager *widget; for ( widget = encoderSettings.first(); widget; widget = encoderSettings.next() ){ - connect(widget, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(slotModuleChanged())); + connect(widget, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(slotModuleChanged())); } //CDDA Options - connect(cd_specify_device,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotConfigChanged())); - connect(ec_enable_check,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotEcEnable())); - connect(ec_skip_check,TQT_SIGNAL(clicked()),TQT_SLOT(slotConfigChanged())); - connect(cd_device_string,TQT_SIGNAL(textChanged(const TQString &)),TQT_SLOT(slotConfigChanged())); - connect(niceLevel,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(slotConfigChanged())); + connect(cd_specify_device,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotConfigChanged())); + connect(ec_enable_check,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotEcEnable())); + connect(ec_skip_check,TQ_SIGNAL(clicked()),TQ_SLOT(slotConfigChanged())); + connect(cd_device_string,TQ_SIGNAL(textChanged(const TQString &)),TQ_SLOT(slotConfigChanged())); + connect(niceLevel,TQ_SIGNAL(valueChanged(int)),TQ_SLOT(slotConfigChanged())); // File Name - connect(fileNameLineEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotConfigChanged())); - connect(albumNameLineEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotConfigChanged())); - connect( kcfg_replaceInput, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( updateExample() ) ); - connect( kcfg_replaceOutput, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( updateExample() ) ); - connect( example, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( updateExample() ) ); - connect( kcfg_replaceInput, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slotConfigChanged() ) ); - connect( kcfg_replaceOutput, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slotConfigChanged() ) ); - connect( example, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slotConfigChanged() ) ); + connect(fileNameLineEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotConfigChanged())); + connect(albumNameLineEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotConfigChanged())); + connect( kcfg_replaceInput, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( updateExample() ) ); + connect( kcfg_replaceOutput, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( updateExample() ) ); + connect( example, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( updateExample() ) ); + connect( kcfg_replaceInput, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( kcfg_replaceOutput, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( example, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( slotConfigChanged() ) ); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmaudiocd"), I18N_NOOP("TDE Audio CD IO Slave"), diff --git a/tdeioslave/audiocd/plugins/audiocdencoder.cpp b/tdeioslave/audiocd/plugins/audiocdencoder.cpp index 05a1c145..cecee6a4 100644 --- a/tdeioslave/audiocd/plugins/audiocdencoder.cpp +++ b/tdeioslave/audiocd/plugins/audiocdencoder.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> #include <tqdir.h> #include <tqregexp.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> /** * Attempt to load a plugin and see if it has the symbol create_audiocd_encoders. diff --git a/tdeioslave/audiocd/plugins/flac/encoderflac.cpp b/tdeioslave/audiocd/plugins/flac/encoderflac.cpp index f8a839c5..acdc8128 100644 --- a/tdeioslave/audiocd/plugins/flac/encoderflac.cpp +++ b/tdeioslave/audiocd/plugins/flac/encoderflac.cpp @@ -37,7 +37,7 @@ extern "C" { - KDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders) + TDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders) { encoders.append(new EncoderFLAC(slave)); } diff --git a/tdeioslave/audiocd/plugins/lame/collectingprocess.cpp b/tdeioslave/audiocd/plugins/lame/collectingprocess.cpp index 4eaf5304..50bf5d42 100644 --- a/tdeioslave/audiocd/plugins/lame/collectingprocess.cpp +++ b/tdeioslave/audiocd/plugins/lame/collectingprocess.cpp @@ -59,18 +59,18 @@ CollectingProcess::~CollectingProcess() { bool CollectingProcess::start( RunMode runmode, Communication comm ) { // prevent duplicate connection - disconnect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); + disconnect( this, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); if ( comm & Stdout ) { - connect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); + connect( this, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); } // prevent duplicate connection - disconnect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); + disconnect( this, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); if ( comm & Stderr ) { - connect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); + connect( this, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); } return TDEProcess::start( runmode, comm ); } diff --git a/tdeioslave/audiocd/plugins/lame/collectingprocess.h b/tdeioslave/audiocd/plugins/lame/collectingprocess.h index 963a59d3..d23e43ab 100644 --- a/tdeioslave/audiocd/plugins/lame/collectingprocess.h +++ b/tdeioslave/audiocd/plugins/lame/collectingprocess.h @@ -33,7 +33,7 @@ #ifndef __COLLECTINGPROCESS_H__ #define __COLLECTINGPROCESS_H__ -#include <kprocess.h> +#include <tdeprocess.h> /** * @short An output collecting TDEProcess class. diff --git a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp index f7535f5f..00f56f40 100644 --- a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp +++ b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <tqgroupbox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> #include <tdeglobal.h> @@ -32,12 +32,12 @@ #include <tdeapplication.h> #include <tqfileinfo.h> #include <tdetempfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "collectingprocess.h" extern "C" { - KDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders) { + TDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders) { encoders.append(new EncoderLame(slave)); } } @@ -233,15 +233,15 @@ long EncoderLame::readInit(long /*size*/){ //kdDebug(7117) << d->currentEncodeProcess->args() << endl; - connect(d->currentEncodeProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(receivedStdout(TDEProcess *, char *, int))); - connect(d->currentEncodeProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(receivedStderr(TDEProcess *, char *, int))); - connect(d->currentEncodeProcess, TQT_SIGNAL(wroteStdin(TDEProcess *)), - this, TQT_SLOT(wroteStdin(TDEProcess *))); + connect(d->currentEncodeProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(receivedStdout(TDEProcess *, char *, int))); + connect(d->currentEncodeProcess, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(receivedStderr(TDEProcess *, char *, int))); + connect(d->currentEncodeProcess, TQ_SIGNAL(wroteStdin(TDEProcess *)), + this, TQ_SLOT(wroteStdin(TDEProcess *))); - connect(d->currentEncodeProcess, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(processExited(TDEProcess *))); + connect(d->currentEncodeProcess, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(processExited(TDEProcess *))); // Launch! d->currentEncodeProcess->start(TDEProcess::NotifyOnExit, KShellProcess::All); @@ -281,7 +281,7 @@ long EncoderLame::read(int16_t *buf, int frames){ // We can't return until the buffer has been written d->waitingForWrite = true; while(d->waitingForWrite && d->currentEncodeProcess->isRunning()){ - kapp->processEvents(); + tdeApp->processEvents(); usleep(1); } @@ -299,7 +299,7 @@ long EncoderLame::readCleanup(){ // Let lame tag the first frame of the mp3 d->currentEncodeProcess->closeStdin(); while( d->currentEncodeProcess->isRunning()){ - kapp->processEvents(); + tdeApp->processEvents(); usleep(1); } diff --git a/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp b/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp index ca9e0294..1a11bbb3 100644 --- a/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp +++ b/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp @@ -40,7 +40,7 @@ extern "C" { - KDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders) + TDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders) { encoders.append(new EncoderVorbis(slave)); } diff --git a/tdeioslave/audiocd/plugins/wav/encoderwav.cpp b/tdeioslave/audiocd/plugins/wav/encoderwav.cpp index 7bed1765..87487733 100644 --- a/tdeioslave/audiocd/plugins/wav/encoderwav.cpp +++ b/tdeioslave/audiocd/plugins/wav/encoderwav.cpp @@ -26,7 +26,7 @@ extern "C" { - KDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders) + TDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders) { encoders.append( new EncoderWav(slave)); encoders.append( new EncoderCda(slave)); diff --git a/tdemid/channel.cpp b/tdemid/channel.cpp index 6b8e23cf..b7e7c870 100644 --- a/tdemid/channel.cpp +++ b/tdemid/channel.cpp @@ -29,10 +29,10 @@ #include <tqcombobox.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeconfig.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "tdemidbutton.h" #include "channel.h" @@ -42,7 +42,7 @@ KMidChannel::KMidChannel(int chn,TQWidget *parent) : TQWidget (parent) { channel=chn; - replay=TRUE; + replay=true; int i; for (i=0;i<128;i++) pressed[i]=0; keyboard = TQPixmap(locate("appdata","icons/keyboard.xpm")); @@ -52,26 +52,26 @@ KMidChannel::KMidChannel(int chn,TQWidget *parent) : TQWidget (parent) TDEConfig *kcfg=TDEGlobal::instance()->config(); kcfg->setGroup("KMid"); - TQFont *qtextfontdefault=new TQFont("lucida",18,TQFont::Bold,TRUE); + TQFont *qtextfontdefault=new TQFont("lucida",18,TQFont::Bold,true); qcvfont=new TQFont(kcfg->readFontEntry("ChannelViewFont",qtextfontdefault)); delete qtextfontdefault; - instrumentCombo = new TQComboBox(FALSE,this,"instr"); + instrumentCombo = new TQComboBox(false,this,"instr"); instrumentCombo->setGeometry(160,2,200,20); for (i=0;i<128;i++) instrumentCombo->insertItem(i18n(instrumentName[i]),i); - connect(instrumentCombo,TQT_SIGNAL(activated(int)),this,TQT_SLOT(pgmChanged(int))); + connect(instrumentCombo,TQ_SIGNAL(activated(int)),this,TQ_SLOT(pgmChanged(int))); forcepgm=new KMidButton(this,"forcepgm"); forcepgm->setGeometry(135,4,16,16); - forcepgm->setToggleButton(TRUE); + forcepgm->setToggleButton(true); button1 = TQPixmap(locate("appdata","icons/button1.xpm")); button2 = TQPixmap(locate("appdata","icons/button2.xpm")); forcepgm->setPixmaps(button1,button2); forcepgm->show(); - connect(forcepgm,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(changeForcedState(bool))); + connect(forcepgm,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(changeForcedState(bool))); } @@ -169,9 +169,9 @@ void KMidChannel::changeInstrument(int pgm) void KMidChannel::changeForceState(bool i) { - replay=FALSE; + replay=false; forcepgm->setOn(i); - replay=TRUE; + replay=true; } void KMidChannel::reset(int level) @@ -180,12 +180,12 @@ void KMidChannel::reset(int level) if (level>=1) { instrumentCombo->setCurrentItem(0); - replay=FALSE; - forcepgm->setOn(FALSE); - replay=TRUE; + replay=false; + forcepgm->setOn(false); + replay=true; }; - repaint(FALSE); + repaint(false); } void KMidChannel::saveState(bool *p,int *pgm) @@ -198,7 +198,7 @@ void KMidChannel::loadState(bool *p,int *pgm) { for (int i=0;i<128;i++) pressed[i]=p[i]; instrumentCombo->setCurrentItem(*pgm); - repaint(FALSE); + repaint(false); } void KMidChannel::pgmChanged(int i) @@ -209,9 +209,9 @@ void KMidChannel::pgmChanged(int i) data[2]=i; data[3]=0; - replay=FALSE; - forcepgm->setOn(TRUE); - replay=TRUE; + replay=false; + forcepgm->setOn(true); + replay=true; emit signalToKMidClient(data); diff --git a/tdemid/channelcfgdlg.cpp b/tdemid/channelcfgdlg.cpp index e55aaa58..533a5573 100644 --- a/tdemid/channelcfgdlg.cpp +++ b/tdemid/channelcfgdlg.cpp @@ -12,7 +12,7 @@ #include <tqlayout.h> #include <tqvbuttongroup.h> -ChannelViewConfigDialog::ChannelViewConfigDialog(TQWidget *parent,const char *name) : KDialogBase(parent,name,TRUE,i18n("Configure Channel View"),Ok|Cancel, Ok) +ChannelViewConfigDialog::ChannelViewConfigDialog(TQWidget *parent,const char *name) : KDialogBase(parent,name,true,i18n("Configure Channel View"),Ok|Cancel, Ok) { TQWidget *page = new TQWidget( this ); setMainWidget(page); @@ -22,12 +22,12 @@ ChannelViewConfigDialog::ChannelViewConfigDialog(TQWidget *parent,const char *na rb0=new TQRadioButton(i18n("3D look"),qbg,"3d"); rb1=new TQRadioButton(i18n("3D - filled"),qbg,"4d"); - qbg->setExclusive(TRUE); + qbg->setExclusive(true); topLayout->addWidget( qbg ); - ((ChannelView::lookMode()==0)?rb0:rb1)->setChecked(TRUE); + ((ChannelView::lookMode()==0)?rb0:rb1)->setChecked(true); - connect (qbg, TQT_SIGNAL(pressed(int)),this,TQT_SLOT(modeselected(int))); + connect (qbg, TQ_SIGNAL(pressed(int)),this,TQ_SLOT(modeselected(int))); } void ChannelViewConfigDialog::modeselected(int idx) diff --git a/tdemid/channelview.cpp b/tdemid/channelview.cpp index 27410baa..140d6a7e 100644 --- a/tdemid/channelview.cpp +++ b/tdemid/channelview.cpp @@ -40,12 +40,12 @@ ChannelView::ChannelView(void) : TDEMainWindow(0, "ChannelView") Channel[i]=new KMidChannel3D(i+1,this); else Channel[i]=new KMidChannel4D(i+1,this); - connect(Channel[i],TQT_SIGNAL(signalToKMidClient(int *)),this,TQT_SLOT(slottotdemidclient(int *))); + connect(Channel[i],TQ_SIGNAL(signalToKMidClient(int *)),this,TQ_SLOT(slottotdemidclient(int *))); Channel[i]->setGeometry(5,5+i*CHANNELHEIGHT,width()-20,CHANNELHEIGHT); Channel[i]->show(); } scrollbar=new TQScrollBar(1,16,1,1,1,TQt::Vertical,this,"Channelscrollbar"); - connect(scrollbar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(ScrollChn(int))); + connect(scrollbar,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(ScrollChn(int))); setScrollBarRange(); } @@ -121,7 +121,7 @@ int ChannelView::lookmode=0; int ChannelView::lookMode(void) { - TDEConfig *kcfg=(TDEApplication::kApplication())->config(); + TDEConfig *kcfg=tdeApp->config(); kcfg->setGroup("KMid"); lookmode=kcfg->readNumEntry("ChannelViewLookMode",0); @@ -131,7 +131,7 @@ int ChannelView::lookMode(void) void ChannelView::lookMode(int i) { - TDEConfig *kcfg=(TDEApplication::kApplication())->config(); + TDEConfig *kcfg=tdeApp->config(); lookmode=i; @@ -150,7 +150,7 @@ void ChannelView::lookMode(int i) else Channel[i]=new KMidChannel4D(i+1,this); - connect(Channel[i],TQT_SIGNAL(signalToKMidClient(int *)),this,TQT_SLOT(slottotdemidclient(int *))); + connect(Channel[i],TQ_SIGNAL(signalToKMidClient(int *)),this,TQ_SLOT(slottotdemidclient(int *))); Channel[i]->setGeometry(5,5+(i-(scrollbar->value()-1))*CHANNELHEIGHT,width()-20,CHANNELHEIGHT); Channel[i]->loadState(tmp,&pgm); Channel[i]->show(); diff --git a/tdemid/collectdlg.cpp b/tdemid/collectdlg.cpp index 4df74df7..4f373b49 100644 --- a/tdemid/collectdlg.cpp +++ b/tdemid/collectdlg.cpp @@ -38,23 +38,23 @@ #include "songlist.h" #include "slman.h" -CollectionDialog::CollectionDialog(SLManager *slm,int selC,TQWidget *parent,const char *name) : TQDialog(parent,name,TRUE) +CollectionDialog::CollectionDialog(SLManager *slm,int selC,TQWidget *parent,const char *name) : TQDialog(parent,name,true) { setCaption(i18n("Collections Manager")); ok=new KPushButton(KStdGuiItem::ok(),this); ok->setGeometry(140,200,100,30); -connect(ok,TQT_SIGNAL(clicked()),TQT_SLOT(accept()) ); +connect(ok,TQ_SIGNAL(clicked()),TQ_SLOT(accept()) ); cancel=new KPushButton(KStdGuiItem::cancel(),this); cancel->setGeometry(250,200,100,30); -connect(cancel,TQT_SIGNAL(clicked()),TQT_SLOT(reject()) ); +connect(cancel,TQ_SIGNAL(clicked()),TQ_SLOT(reject()) ); label=new TQLabel(i18n("Available collections:"),this); label->adjustSize(); label->move(10,10); collections=new TQListBox(this,"collectionlist"); collections->setGeometry(10,20+label->height(),340,90); -connect(collections,TQT_SIGNAL(highlighted(int)),TQT_SLOT(collectionselected(int))); -connect(collections,TQT_SIGNAL(selected(int)),TQT_SLOT(changeCollectionName(int))); +connect(collections,TQ_SIGNAL(highlighted(int)),TQ_SLOT(collectionselected(int))); +connect(collections,TQ_SIGNAL(selected(int)),TQ_SLOT(changeCollectionName(int))); slman=slm; for (int i=0;i<=slman->numberOfCollections();i++) { @@ -74,7 +74,7 @@ label2->move(10,collections->y()+collections->height()+10); songs=new TQListBox(this,"songlist"); songs->setGeometry(10,label2->y()+label2->height()+10,340,120); -connect(songs,TQT_SIGNAL(highlighted(int)),TQT_SLOT(songselected(int))); +connect(songs,TQ_SIGNAL(highlighted(int)),TQ_SLOT(songselected(int))); currentsl=slman->getCollection(selectedC); if (slman->numberOfCollections()>0) { @@ -85,24 +85,24 @@ if (slman->numberOfCollections()>0) newC=new TQPushButton(i18n("&New..."),this); newC->adjustSize(); newC->move(360,collections->y()+5); -connect(newC,TQT_SIGNAL(clicked()),TQT_SLOT(newCollection()) ); +connect(newC,TQ_SIGNAL(clicked()),TQ_SLOT(newCollection()) ); copyC=new TQPushButton(i18n("&Copy..."),this); copyC->adjustSize(); copyC->move(360,newC->y()+newC->height()+5); -connect(copyC,TQT_SIGNAL(clicked()),TQT_SLOT(copyCollection()) ); +connect(copyC,TQ_SIGNAL(clicked()),TQ_SLOT(copyCollection()) ); deleteC=new TQPushButton(i18n("Delete"),this); deleteC->adjustSize(); deleteC->move(360,copyC->y()+copyC->height()+5); -connect(deleteC,TQT_SIGNAL(clicked()),TQT_SLOT(deleteCollection()) ); +connect(deleteC,TQ_SIGNAL(clicked()),TQ_SLOT(deleteCollection()) ); addS=new TQPushButton(i18n("&Add..."),this); addS->adjustSize(); addS->move(360,songs->y()+5); -connect(addS,TQT_SIGNAL(clicked()),TQT_SLOT(addSong()) ); +connect(addS,TQ_SIGNAL(clicked()),TQ_SLOT(addSong()) ); delS=new TQPushButton(i18n("&Remove"),this); delS->adjustSize(); delS->move(360,addS->y()+addS->height()+5); -connect(delS,TQT_SIGNAL(clicked()),TQT_SLOT(removeSong()) ); +connect(delS,TQ_SIGNAL(clicked()),TQ_SLOT(removeSong()) ); ok->move(ok->x(),songs->y()+songs->height()+10); cancel->move(ok->x()+ok->width()+5,ok->y()); diff --git a/tdemid/kdisptext.cpp b/tdemid/kdisptext.cpp index d701ccb4..a7e58295 100644 --- a/tdemid/kdisptext.cpp +++ b/tdemid/kdisptext.cpp @@ -31,7 +31,7 @@ #include <tdeconfig.h> #include <tdeglobal.h> #include <tdeglobalsettings.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include "version.h" @@ -122,10 +122,10 @@ void KDisplayText::ClearEv(bool totally) RemoveLinkedList(); if (totally) { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); autoscrollv=0; resizeContents(0,0); - viewport()->repaint(TRUE); + viewport()->repaint(true); } } @@ -425,7 +425,7 @@ void KDisplayText::PaintIn(int type) autoscrollv+=qfmetr->lineSpacing(); if (b) startTimer(100); else { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); startTimer(100/(autoscrollv/qfmetr->lineSpacing()+1)); } } @@ -484,7 +484,7 @@ void KDisplayText::gotomsec(ulong i) } - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); autoscrollv=0; setContentsPos(0,first_line->ypos); viewport()->repaint(); @@ -508,7 +508,7 @@ void KDisplayText::fontChanged(void) qfmetr=new TQFontMetrics(*qtextfont); calculatePositions(); nvisiblelines=height()/qfmetr->lineSpacing(); - viewport()->repaint(TRUE); + viewport()->repaint(true); } void KDisplayText::ChangeTypeOfTextEvents(int type) @@ -534,7 +534,7 @@ void KDisplayText::ChangeTypeOfTextEvents(int type) setContentsPos(0,first_line->ypos); } - viewport()->repaint(TRUE); + viewport()->repaint(true); } int KDisplayText::ChooseTypeOfTextEvents(void) diff --git a/tdemid/klcdnumber.cpp b/tdemid/klcdnumber.cpp index 3fdf80c4..7b3ac247 100644 --- a/tdemid/klcdnumber.cpp +++ b/tdemid/klcdnumber.cpp @@ -71,10 +71,10 @@ KLCDNumber::KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *parent, downBtn=new KTriangleButton(KTriangleButton::Left,this,"Down"); upBtn->setGeometry(width()-BUTTONWIDTH,0,BUTTONWIDTH,height()); downBtn->setGeometry(0,0,BUTTONWIDTH,height()); - connect(upBtn,TQT_SIGNAL(clicked()),this,TQT_SLOT(increaseValue())); - connect(downBtn,TQT_SIGNAL(clicked()),this,TQT_SLOT(decreaseValue())); - connect(upBtn,TQT_SIGNAL(clickedQuickly()),this,TQT_SLOT(increaseValueFast())); - connect(downBtn,TQT_SIGNAL(clickedQuickly()),this,TQT_SLOT(decreaseValueFast())); + connect(upBtn,TQ_SIGNAL(clicked()),this,TQ_SLOT(increaseValue())); + connect(downBtn,TQ_SIGNAL(clicked()),this,TQ_SLOT(decreaseValue())); + connect(upBtn,TQ_SIGNAL(clickedQuickly()),this,TQ_SLOT(increaseValueFast())); + connect(downBtn,TQ_SIGNAL(clickedQuickly()),this,TQ_SLOT(decreaseValueFast())); }; } @@ -197,7 +197,7 @@ void KLCDNumber::setValue(double v) void KLCDNumber::display (double v) { setValue(v); - repaint(FALSE); + repaint(false); } void KLCDNumber::display (int v) @@ -299,7 +299,7 @@ void KLCDNumber::mousePressEvent (TQMouseEvent *e) void KLCDNumber::timerEvent(TQTimerEvent *) { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); doubleclicked=false; } @@ -317,13 +317,13 @@ void KLCDNumber::defaultValueClicked() void KLCDNumber::setLCDBackgroundColor(int r,int g,int b) { backgcolor=TQColor(r,g,b); - repaint(FALSE); + repaint(false); } void KLCDNumber::setLCDColor(int r,int g,int b) { LCDcolor=TQColor(r,g,b); - repaint(FALSE); + repaint(false); } void KLCDNumber::setRange(double min, double max) diff --git a/tdemid/ktrianglebutton.cpp b/tdemid/ktrianglebutton.cpp index 34551627..4f7fb139 100644 --- a/tdemid/ktrianglebutton.cpp +++ b/tdemid/ktrianglebutton.cpp @@ -34,7 +34,7 @@ KTriangleButton::KTriangleButton( Direction d,TQWidget *_parent, const char *nam : TQButton( _parent , name) { dir=d; - raised = FALSE; + raised = false; setFocusPolicy( TQWidget::NoFocus ); } @@ -46,16 +46,16 @@ void KTriangleButton::enterEvent( TQEvent* ) { if ( isEnabled() ) { - raised = TRUE; - repaint(FALSE); + raised = true; + repaint(false); } } void KTriangleButton::leaveEvent( TQEvent * ) { - if( raised != FALSE ) + if( raised != false ) { - raised = FALSE; + raised = false; repaint(); } } @@ -77,19 +77,19 @@ void KTriangleButton::paint( TQPainter *painter ) { if ( style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) qDrawWinButton( painter, 0, 0, width(), - height(), colorGroup(), TRUE ); + height(), colorGroup(), true ); else qDrawShadePanel( painter, 0, 0, width(), - height(), colorGroup(), TRUE, 2, 0L ); + height(), colorGroup(), true, 2, 0L ); } else if ( raised ) { if ( style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) qDrawWinButton( painter, 0, 0, width(), height(), - colorGroup(), FALSE ); + colorGroup(), false ); else qDrawShadePanel( painter, 0, 0, width(), height(), - colorGroup(), FALSE, 2, 0L ); + colorGroup(), false, 2, 0L ); } if (dir==Right) @@ -144,17 +144,17 @@ void KTriangleButton::mouseReleaseEvent(TQMouseEvent *e) void KTriangleButton::timerEvent(TQTimerEvent *) { - if (!usingTimer) {TQT_TQOBJECT(this)->killTimers();return;}; + if (!usingTimer) {this->killTimers();return;}; if (timeCount==0) { timeCount++; - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); startTimer(120); } else if (timeCount==30) { timeCount=-1; - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); startTimer(80); } else if (timeCount>0) timeCount++; diff --git a/tdemid/main.cpp b/tdemid/main.cpp index 40902097..3f12b7c9 100644 --- a/tdemid/main.cpp +++ b/tdemid/main.cpp @@ -71,7 +71,7 @@ int main(int argc, char **argv) app.setMainWidget ( tdemidframe ); - TQObject::connect(&app,TQT_SIGNAL(shutDown()),tdemidframe,TQT_SLOT(shuttingDown())); + TQObject::connect(&app,TQ_SIGNAL(shutDown()),tdemidframe,TQ_SLOT(shuttingDown())); if (app.isRestored()) { diff --git a/tdemid/midicfgdlg.cpp b/tdemid/midicfgdlg.cpp index 446f7e03..c5c55d6f 100644 --- a/tdemid/midicfgdlg.cpp +++ b/tdemid/midicfgdlg.cpp @@ -35,10 +35,10 @@ #include "midicfgdlg.h" #include "version.h" #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> MidiConfigDialog::MidiConfigDialog(DeviceManager *dm, - TQWidget *parent,const char *name) : KDialogBase(parent,name,TRUE, + TQWidget *parent,const char *name) : KDialogBase(parent,name,true, i18n("Configure MIDI Devices"), KDialogBase::Ok|KDialogBase::Cancel) { setMinimumSize(360,240); @@ -50,7 +50,7 @@ MidiConfigDialog::MidiConfigDialog(DeviceManager *dm, topLayout->addWidget(label); mididevices=new TQListBox(page,"midideviceslist"); topLayout->addWidget(mididevices,3); - connect(mididevices,TQT_SIGNAL(highlighted(int)),TQT_SLOT(deviceselected(int))); + connect(mididevices,TQ_SIGNAL(highlighted(int)),TQ_SLOT(deviceselected(int))); devman=dm; TQString temp; for (int i=0;i<devman->midiPorts()+devman->synthDevices();i++) @@ -87,11 +87,11 @@ MidiConfigDialog::MidiConfigDialog(DeviceManager *dm, hbox->addStretch(1); mapbrowse=new TQPushButton(i18n("Browse..."),page); hbox->addWidget(mapbrowse); - connect(mapbrowse,TQT_SIGNAL(clicked()),TQT_SLOT(browseMap()) ); + connect(mapbrowse,TQ_SIGNAL(clicked()),TQ_SLOT(browseMap()) ); mapnone=new TQPushButton(i18n("None"),page); hbox->addWidget(mapnone); - connect(mapnone,TQT_SIGNAL(clicked()),TQT_SLOT(noMap()) ); + connect(mapnone,TQ_SIGNAL(clicked()),TQ_SLOT(noMap()) ); topLayout->addStretch(1); diff --git a/tdemid/tdemid.spec b/tdemid/tdemid.spec deleted file mode 100644 index 7305dfe1..00000000 --- a/tdemid/tdemid.spec +++ /dev/null @@ -1,62 +0,0 @@ -Summary: Play midi/karaoke files and show lyrics. Support External synths, AWE, GUS, and FM devices. For X11/KDE -Name: tdemid -Version: 1.2 -Release: 1 -Copyright: GPL -Group: X11/K Desktop Environment/Multimedia -Source: tdemid-1.2.tar.gz -Requires: qt >= 1.3 , tdelibs - -%description -KMid is a midi/karaoke file player, with configurable midi mapper, -real Session Management, drag & drop, customizable fonts, etc. -It has a very nice interface which let you easily follow the tune while -changing the color of the lyrics. -It supports output through external synthesizers, AWE, FM and GUS cards. -It also has a keyboard view to see the notes played by each instrument - -%prep -%setup - -%build -export TDEDIR=/opt/kde -./configure -make all - -%install -export TDEDIR=/opt/kde -make install - -%files -%doc tdemid/README tdemid/COPYING tdemid/PEOPLE tdemid/tdemid.lsm tdemid/ChangeLog - -/opt/kde/bin/tdemid -/opt/kde/share/doc/tde/HTML/en/tdemid -/opt/kde/share/doc/tde/HTML/es/tdemid -/opt/kde/share/icons/tdemid.xpm -/opt/kde/share/icons/mini/tdemid.xpm -/opt/kde/share/applnk/Multimedia/tdemid.kdelnk -/opt/kde/share/mimelnk/audio/x-karaoke.kdelnk -/opt/kde/share/apps/tdemid/toolbar -/opt/kde/share/apps/tdemid/fm -/opt/kde/share/apps/tdemid/maps/gm.map -/opt/kde/share/apps/tdemid/maps/YamahaPSS790.map -/opt/kde/share/apps/tdemid/maps/YamahaPSR500.map -/opt/kde/share/apps/tdemid/OFortuna.kar -/opt/kde/share/apps/tdemid/StopInTheNameOfLove.kar -/opt/kde/share/apps/tdemid/TheGirlFromIpanema.kar -/opt/kde/share/apps/tdemid/AnotherGlitchInTheCall.kar -/opt/kde/share/locale/es/LC_MESSAGES/tdemid.mo -/opt/kde/share/locale/cs/LC_MESSAGES/tdemid.mo -/opt/kde/share/locale/de/LC_MESSAGES/tdemid.mo -/opt/kde/share/locale/fi/LC_MESSAGES/tdemid.mo -/opt/kde/share/locale/hr/LC_MESSAGES/tdemid.mo -/opt/kde/share/locale/pl/LC_MESSAGES/tdemid.mo -/opt/kde/share/locale/pt/LC_MESSAGES/tdemid.mo -/opt/kde/share/locale/sk/LC_MESSAGES/tdemid.mo -/opt/kde/share/locale/eo/LC_MESSAGES/tdemid.mo -/opt/kde/share/locale/no/LC_MESSAGES/tdemid.mo -/opt/kde/share/locale/sv/LC_MESSAGES/tdemid.mo -/opt/kde/share/locale/pt_BR/LC_MESSAGES/tdemid.mo -/opt/kde/share/locale/zh_CN.GB2312/LC_MESSAGES/tdemid.mo -/opt/kde/share/locale/zh_TW.Big5/LC_MESSAGES/tdemid.mo diff --git a/tdemid/tdemid_part.cpp b/tdemid/tdemid_part.cpp index 17ce3c1b..ae176f8c 100644 --- a/tdemid/tdemid_part.cpp +++ b/tdemid/tdemid_part.cpp @@ -1,6 +1,6 @@ #include "tdemid_part.h" -#include <kinstance.h> +#include <tdeinstance.h> #include <kiconloader.h> #include <tdelocale.h> #include <tdeaboutdata.h> @@ -78,21 +78,21 @@ TDEInstance *KMidFactory::instance() // create and connect our actions (void)new TDEAction(i18n("Play"), "media-playback-start", 0, this, - TQT_SLOT(slotPlay()), actionCollection(), + TQ_SLOT(slotPlay()), actionCollection(), "play"); (void)new TDEAction(i18n("Stop"), "media-playback-stop", 0, this, - TQT_SLOT(slotStop()), actionCollection(), + TQ_SLOT(slotStop()), actionCollection(), "stop"); (void)new TDEAction(i18n("Backward"), "2leftarrow", 0, this, - TQT_SLOT(slotBackward()), actionCollection(), + TQ_SLOT(slotBackward()), actionCollection(), "backward"); (void)new TDEAction(i18n("Forward"), "2rightarrow", 0, this, - TQT_SLOT(slotForward()), actionCollection(), + TQ_SLOT(slotForward()), actionCollection(), "forward"); m_extension = new KMidBrowserExtension(this); @@ -111,7 +111,7 @@ bool KMidPart::openFile() widget->openURL(m_file); widget->stop(); widget->show(); - TQTimer::singleShot(2000, this, TQT_SLOT(slotPlay())); + TQTimer::singleShot(2000, this, TQ_SLOT(slotPlay())); return true; } diff --git a/tdemid/tdemid_part.h b/tdemid/tdemid_part.h index 7217a7b7..03c053ef 100644 --- a/tdemid/tdemid_part.h +++ b/tdemid/tdemid_part.h @@ -9,7 +9,7 @@ class TDEInstance; class KMidBrowserExtension; class tdemidClient; -class KDE_EXPORT KMidFactory : public KParts::Factory +class TDE_EXPORT KMidFactory : public KParts::Factory { TQ_OBJECT diff --git a/tdemid/tdemidclient.cpp b/tdemid/tdemidclient.cpp index cc6cce2d..8579ae88 100644 --- a/tdemid/tdemidclient.cpp +++ b/tdemid/tdemidclient.cpp @@ -43,7 +43,7 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurl.h> #include <tdeaction.h> #include <kdebug.h> @@ -69,7 +69,7 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char : DCOPObject("KMidIface"), TQWidget(parent,name) { actionCollection=ac; - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); midifile_opened=0L; loopsong=cfg->readNumEntry("Loop",0); @@ -93,7 +93,7 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char timebar = new TQSlider(0,240000,30000,60000,TQt::Horizontal, this); timebar->setSteps(30000,60000); timebar->setValue(0); - connect (timebar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotSeek(int))); + connect (timebar,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(slotSeek(int))); timetags = new QSliderTime(timebar,this); timetags->setMinimumSize(timetags->sizeHint()); @@ -109,14 +109,14 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char tempoLCD->setDefaultValue(120); tempoLCD->setUserSetDefaultValue(true); tempoLCD->setMinimumSize(tempoLCD->sizeHint()); - connect(tempoLCD,TQT_SIGNAL(valueChanged(double)),this,TQT_SLOT(slotSetTempo(double))); + connect(tempoLCD,TQ_SIGNAL(valueChanged(double)),this,TQ_SLOT(slotSetTempo(double))); - comboSongs = new TQComboBox(FALSE, this,"Songs"); - connect (comboSongs,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotSelectSong(int))); + comboSongs = new TQComboBox(false, this,"Songs"); + connect (comboSongs,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotSelectSong(int))); comboSongs->setMinimumWidth(200); - comboEncodings = new TQComboBox(FALSE, this, "Encodings"); - connect (comboEncodings,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotSelectEncoding(int))); + comboEncodings = new TQComboBox(false, this, "Encodings"); + connect (comboEncodings,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotSelectEncoding(int))); comboEncodings->insertItem(i18n("Default")); comboEncodings->insertStringList( TDEGlobal::charsets()->descriptiveEncodingNames() ); comboEncodings->setCurrentItem(0); @@ -130,7 +130,7 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char volumebar->setValue(100); volumebar->setTickmarks(TQSlider::NoMarks); volumebar->setTickInterval(50); - connect (volumebar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotSetVolume(int))); + connect (volumebar,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(slotSetVolume(int))); visiblevolumebar=cfg->readNumEntry("ShowVolumeBar",0); if (visiblevolumebar) volumebar->show(); @@ -141,9 +141,9 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char kdispt->show(); timer4timebar=new TQTimer(this); - connect (timer4timebar,TQT_SIGNAL(timeout()),this,TQT_SLOT(timebarUpdate())); + connect (timer4timebar,TQ_SIGNAL(timeout()),this,TQ_SLOT(timebarUpdate())); timer4events=new TQTimer(this); - connect (timer4events,TQT_SIGNAL(timeout()),this,TQT_SLOT(processSpecialEvent())); + connect (timer4events,TQ_SIGNAL(timeout()),this,TQ_SLOT(processSpecialEvent())); TQString samplefile = TDEGlobal::dirs()->findAllResources("appdata", "fm/*.o3").last(); @@ -310,9 +310,9 @@ int tdemidClient::openFile(const char *filename) midifile_opened=0L; timebar->setRange(0,240000); timebar->setValue(0); - timetags->repaint(TRUE); + timetags->repaint(true); kdispt->ClearEv(); - kdispt->repaint(TRUE); + kdispt->repaint(true); topLevelWidget()->setCaption("KMid"); return -1; @@ -327,7 +327,7 @@ int tdemidClient::openFile(const char *filename) // noteArray=player->parseNotes(); noteArray=player->noteArray(); timebar->setRange(0,(int)(player->information()->millisecsTotal)); - timetags->repaint(TRUE); + timetags->repaint(true); kdispt->ClearEv(); spev=player->specialEvents(); while (spev) @@ -343,7 +343,7 @@ int tdemidClient::openFile(const char *filename) kdispt->CursorToHome(); // kdispt->updateScrollBars(); emit mustRechooseTextEvent(); - kdispt->repaint(TRUE); + kdispt->repaint(true); tempoLCD->display(tempoToMetronomeTempo(m_kMid.pctl->tempo)); currentTempo=tempoLCD->getValue(); tempoLCD->setDefaultValue(tempoToMetronomeTempo(m_kMid.pctl->tempo)*m_kMid.pctl->ratioTempo); @@ -372,10 +372,10 @@ int tdemidClient::openURL(const TQString _url) filename = TQString("/tmp/") + u.filename(); TDEIO::Job *iojob = TDEIO::copy( u, KURL::fromPathOrURL( filename ) ); downloaded=false; - connect( iojob, TQT_SIGNAL( result( TDEIO::Job *) ), this, TQT_SLOT(downloadFinished( TDEIO::Job * ) ) ); + connect( iojob, TQ_SIGNAL( result( TDEIO::Job *) ), this, TQ_SLOT(downloadFinished( TDEIO::Job * ) ) ); if (!downloaded) - kapp->enter_loop(); + tdeApp->enter_loop(); deleteFile=true; } @@ -565,7 +565,7 @@ void tdemidClient::slotPlay() int type; ulong x=timeOfNextEvent(&type); if (type!=0) - timer4events->start(x,TRUE); + timer4events->start(x,true); timer4timebar->start(1000); @@ -669,12 +669,12 @@ void tdemidClient::slotSeek(int i) int type; ulong x=timeOfNextEvent(&type); if (type!=0) - timer4events->start(x-(currentmillisec-beginmillisec),TRUE); + timer4events->start(x-(currentmillisec-beginmillisec),true); /* if (spev==NULL) return; ulong delaymillisec=spev->absmilliseconds-(currentmillisec-beginmillisec); - timer4events->start(delaymillisec,TRUE); + timer4events->start(delaymillisec,true); */ m_kMid.pctl->OK=0; @@ -892,7 +892,7 @@ void tdemidClient::slotPause() int type; ulong x=timeOfNextEvent(&type); if (type!=0) - timer4events->start(x-(currentmillisec-beginmillisec),TRUE); + timer4events->start(x-(currentmillisec-beginmillisec),true); timer4timebar->start(1000); if (noteArray!=NULL) @@ -925,7 +925,7 @@ void tdemidClient::slotStop() if (!shuttingdown) { - for (int i=0;i<16;i++) m_kMid.pctl->forcepgm[i]=FALSE; + for (int i=0;i<16;i++) m_kMid.pctl->forcepgm[i]=false; if (channelView) channelView->reset(); if (tempoLCD) { @@ -1121,7 +1121,7 @@ void tdemidClient::processSpecialEvent() if (delaymillisec<10) processNext=1; } - if (delaymillisec!=~(long)0) timer4events->start(delaymillisec,TRUE); + if (delaymillisec!=~(long)0) timer4events->start(delaymillisec,true); } @@ -1129,7 +1129,7 @@ void tdemidClient::repaintText(int type) { kdispt->ChangeTypeOfTextEvents(type); typeoftextevents=type; - kdispt->repaint(TRUE); + kdispt->repaint(true); } int tdemidClient::ChooseTypeOfTextEvents(void) @@ -1265,11 +1265,11 @@ void tdemidClient::slotSelectSong(int i) player->removeSong(); timebar->setRange(0,240000); timebar->setValue(0); - timetags->repaint(TRUE); + timetags->repaint(true); kdispt->ClearEv(); - kdispt->repaint(TRUE); + kdispt->repaint(true); comboSongs->clear(); - comboSongs->repaint(TRUE); + comboSongs->repaint(true); topLevelWidget()->setCaption("KMid"); return; } @@ -1373,8 +1373,8 @@ void tdemidClient::visibleChannelView(int i) } } channelView->show(); - connect(channelView,TQT_SIGNAL(signalToKMidClient(int *)),this,TQT_SLOT(communicationFromChannelView(int *))); - connect(kapp,TQT_SIGNAL(shutDown()),parentWidget(),TQT_SLOT(shuttingDown())); + connect(channelView,TQ_SIGNAL(signalToKMidClient(int *)),this,TQ_SLOT(communicationFromChannelView(int *))); + connect(tdeApp,TQ_SIGNAL(shutDown()),parentWidget(),TQ_SLOT(shuttingDown())); } else if ((channelView!=NULL)&&(i==0)) @@ -1410,7 +1410,7 @@ void tdemidClient::rethinkNextEvent(void) currentmillisec=tv.tv_sec*1000+tv.tv_usec/1000; delaymillisec=x-(currentmillisec-beginmillisec); - timer4events->start(delaymillisec,TRUE); + timer4events->start(delaymillisec,true); } void tdemidClient::communicationFromChannelView(int *i) @@ -1487,7 +1487,7 @@ void tdemidClient::slotSetTempo(double value) timebar->setRange(0,(int)(player->information()->millisecsTotal)); timebar->setValue(pausedatmillisec); - timetags->repaint(TRUE); + timetags->repaint(true); kdispt->ClearEv(false); @@ -1519,7 +1519,7 @@ void tdemidClient::slotSetTempo(double value) void tdemidClient::downloadFinished(TDEIO::Job *) { downloaded=true; - kapp->exit_loop(); + tdeApp->exit_loop(); } TQSize tdemidClient::sizeHint() const diff --git a/tdemid/tdemidframe.cpp b/tdemid/tdemidframe.cpp index fbfaa4c0..aa10a6e4 100644 --- a/tdemid/tdemidframe.cpp +++ b/tdemid/tdemidframe.cpp @@ -68,73 +68,73 @@ tdemidFrame::tdemidFrame(const char *name) /* kKeysAccel=new TDEAccel(this); kKeysAccel->insertItem(i18n("Play/Pause"),"Play/Pause", Key_Space); - kKeysAccel->connectItem("Play/Pause", TQT_TQOBJECT(this), TQT_SLOT(spacePressed())); + kKeysAccel->connectItem("Play/Pause", this, TQ_SLOT(spacePressed())); kKeysAccel->insertItem(i18n("Stop"),"Stop", Key_Backspace); - kKeysAccel->connectItem("Stop",tdemidclient,TQT_SLOT(song_Stop())); + kKeysAccel->connectItem("Stop",tdemidclient,TQ_SLOT(song_Stop())); kKeysAccel->insertItem(i18n("Previous Song"),"Previous Song", Key_Left); - kKeysAccel->connectItem("Previous Song",tdemidclient,TQT_SLOT(song_PlayPrevSong())); + kKeysAccel->connectItem("Previous Song",tdemidclient,TQ_SLOT(song_PlayPrevSong())); kKeysAccel->insertItem(i18n("Next Song"),"Next Song", Key_Right); - kKeysAccel->connectItem("Next Song",tdemidclient,TQT_SLOT(song_PlayNextSong())); + kKeysAccel->connectItem("Next Song",tdemidclient,TQ_SLOT(song_PlayNextSong())); kKeysAccel->insertItem(i18n("Scroll Down Karaoke"),"Scroll down karaoke",Key_Down); - kKeysAccel->connectItem("Scroll Down karaoke",tdemidclient->getKDisplayText(),TQT_SLOT(ScrollDown())); + kKeysAccel->connectItem("Scroll Down karaoke",tdemidclient->getKDisplayText(),TQ_SLOT(ScrollDown())); kKeysAccel->insertItem(i18n("Scroll Up Karaoke"),"Scroll up karaoke",Key_Up); - kKeysAccel->connectItem("Scroll Up Karaoke",tdemidclient->getKDisplayText(),TQT_SLOT(ScrollUp())); + kKeysAccel->connectItem("Scroll Up Karaoke",tdemidclient->getKDisplayText(),TQ_SLOT(ScrollUp())); kKeysAccel->insertItem(i18n("Scroll Page Down Karaoke"),"Scroll page down karaoke",Key_PageDown); - kKeysAccel->connectItem("Scroll Page Down Karaoke",tdemidclient->getKDisplayText(),TQT_SLOT(ScrollPageDown())); + kKeysAccel->connectItem("Scroll Page Down Karaoke",tdemidclient->getKDisplayText(),TQ_SLOT(ScrollPageDown())); kKeysAccel->insertItem(i18n("Scroll Page Up Karaoke"),"Scroll page up karaoke",Key_PageUp); - kKeysAccel->connectItem("Scroll Page Up Karaoke",tdemidclient->getKDisplayText(),TQT_SLOT(ScrollPageUp())); + kKeysAccel->connectItem("Scroll Page Up Karaoke",tdemidclient->getKDisplayText(),TQ_SLOT(ScrollPageUp())); kKeysAccel->readSettings(); */ - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(file_Open()), actionCollection()); - (void)new TDEAction(i18n("&Save Lyrics..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(file_SaveLyrics()), actionCollection(), "file_save_lyrics"); - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); + KStdAction::open(this, TQ_SLOT(file_Open()), actionCollection()); + (void)new TDEAction(i18n("&Save Lyrics..."), 0, this, + TQ_SLOT(file_SaveLyrics()), actionCollection(), "file_save_lyrics"); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); (void)new TDEAction(i18n("&Play"), "media-playback-start", TQt::Key_Space, - TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotPlay()), actionCollection(), "song_play"); - (void)new TDEAction(i18n("P&ause"), "media-playback-pause", TQt::Key_P, TQT_TQOBJECT(tdemidclient), - TQT_SLOT(slotPause()), actionCollection(), "song_pause"); + tdemidclient, TQ_SLOT(slotPlay()), actionCollection(), "song_play"); + (void)new TDEAction(i18n("P&ause"), "media-playback-pause", TQt::Key_P, tdemidclient, + TQ_SLOT(slotPause()), actionCollection(), "song_pause"); (void)new TDEAction(i18n("&Stop"), "media-playback-stop", TQt::Key_Backspace, - TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotStop()), actionCollection(), "song_stop"); + tdemidclient, TQ_SLOT(slotStop()), actionCollection(), "song_stop"); (void)new TDEAction(i18n("P&revious Song"), "media-skip-backward", Key_Left, - TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotPrevSong()), actionCollection(), + tdemidclient, TQ_SLOT(slotPrevSong()), actionCollection(), "song_previous"); (void)new TDEAction(i18n("&Next Song"), "media-skip-forward", Key_Right, - TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotNextSong()), actionCollection(), + tdemidclient, TQ_SLOT(slotNextSong()), actionCollection(), "song_next"); - (void)new TDEToggleAction(i18n("&Loop"), 0, TQT_TQOBJECT(this), TQT_SLOT(song_Loop()), + (void)new TDEToggleAction(i18n("&Loop"), 0, this, TQ_SLOT(song_Loop()), actionCollection(), "song_loop"); - (void)new TDEAction(i18n("Rewind"), "2leftarrow", 0, TQT_TQOBJECT(tdemidclient), - TQT_SLOT(slotRewind()), actionCollection(), "song_rewind"); + (void)new TDEAction(i18n("Rewind"), "2leftarrow", 0, tdemidclient, + TQ_SLOT(slotRewind()), actionCollection(), "song_rewind"); - (void)new TDEAction(i18n("Forward"), "2rightarrow", 0, TQT_TQOBJECT(tdemidclient), - TQT_SLOT(slotForward()), actionCollection(), "song_forward"); + (void)new TDEAction(i18n("Forward"), "2rightarrow", 0, tdemidclient, + TQ_SLOT(slotForward()), actionCollection(), "song_forward"); - (void)new TDEAction(i18n("&Organize..."), 0, TQT_TQOBJECT(this), TQT_SLOT(collect_organize()), + (void)new TDEAction(i18n("&Organize..."), 0, this, TQ_SLOT(collect_organize()), actionCollection(), "collect_organize"); TQStringList playmodes; playmodes.append(i18n("In Order")); playmodes.append(i18n("Shuffle")); - TDESelectAction *act=new TDESelectAction(i18n("Play Order"), 0, /*this, TQT_SLOT(collect_PlayOrder(int)),*/ + TDESelectAction *act=new TDESelectAction(i18n("Play Order"), 0, /*this, TQ_SLOT(collect_PlayOrder(int)),*/ actionCollection(), "play_order"); - connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(collect_PlayOrder(int))); + connect(act,TQ_SIGNAL(activated(int)),this, TQ_SLOT(collect_PlayOrder(int))); act->setItems(playmodes); - (void)new TDEToggleAction(i18n("Auto-Add to Collection"), 0, TQT_TQOBJECT(this), - TQT_SLOT(collect_AutoAdd()), actionCollection(), "collect_autoadd"); + (void)new TDEToggleAction(i18n("Auto-Add to Collection"), 0, this, + TQ_SLOT(collect_AutoAdd()), actionCollection(), "collect_autoadd"); playmodes.clear(); playmodes.append(i18n("&General MIDI")); playmodes.append(i18n("&MT-32")); - act=new TDESelectAction(i18n("File Type"), 0,/* this, TQT_SLOT(options_FileType(int)),*/ + act=new TDESelectAction(i18n("File Type"), 0,/* this, TQ_SLOT(options_FileType(int)),*/ actionCollection(), "file_type"); - connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(options_FileType(int))); + connect(act,TQ_SIGNAL(activated(int)),this, TQ_SLOT(options_FileType(int))); act->setItems(playmodes); playmodes.clear(); @@ -142,40 +142,40 @@ tdemidFrame::tdemidFrame(const char *name) playmodes.append(i18n("&Lyric Events")); act=new TDESelectAction(i18n("Display Events"), Key_T, /*this, - TQT_SLOT(options_DisplayEvents(int)),*/ actionCollection(), + TQ_SLOT(options_DisplayEvents(int)),*/ actionCollection(), "display_events"); - connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(options_DisplayEvents(int))); + connect(act,TQ_SIGNAL(activated(int)),this, TQ_SLOT(options_DisplayEvents(int))); act->setItems(playmodes); - (void)new TDEToggleAction(i18n("Automatic Text Chooser"), 0, TQT_TQOBJECT(this), - TQT_SLOT(options_AutomaticText()), actionCollection(), + (void)new TDEToggleAction(i18n("Automatic Text Chooser"), 0, this, + TQ_SLOT(options_AutomaticText()), actionCollection(), "option_automatictext"); TDEToggleAction* togact = new TDEToggleAction(i18n("Show &Volume Bar"), "volume", - 0, TQT_TQOBJECT(this), TQT_SLOT(options_ShowVolumeBar()), actionCollection(), + 0, this, TQ_SLOT(options_ShowVolumeBar()), actionCollection(), "toggle_volumebar"); togact->setCheckedState(i18n("Hide &Volume Bar")); togact = new TDEToggleAction(i18n("Show &Channel View"), "piano", - 0, TQT_TQOBJECT(this), TQT_SLOT(options_ShowChannelView()), actionCollection(), + 0, this, TQ_SLOT(options_ShowChannelView()), actionCollection(), "toggle_channelview"); togact->setCheckedState(i18n("Hide &Channel View")); - (void)new TDEAction(i18n("Channel View &Options..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(options_ChannelViewOptions()), actionCollection(), + (void)new TDEAction(i18n("Channel View &Options..."), 0, this, + TQ_SLOT(options_ChannelViewOptions()), actionCollection(), "channelview_options"); - (void)new TDEAction(i18n("&Font Change..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(options_FontChange()), actionCollection(), + (void)new TDEAction(i18n("&Font Change..."), 0, this, + TQ_SLOT(options_FontChange()), actionCollection(), "change_font"); - (void)new TDEAction(i18n("MIDI &Setup..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(options_MidiSetup()), actionCollection(), "midi_setup"); + (void)new TDEAction(i18n("MIDI &Setup..."), 0, this, + TQ_SLOT(options_MidiSetup()), actionCollection(), "midi_setup"); setupGUI((ToolBar | Keys | StatusBar | Save | Create ), "tdemidui.rc" ); - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); TDESelectAction *tmplistaction= ((TDESelectAction*)actionCollection()->action("display_events")); @@ -212,14 +212,14 @@ tdemidFrame::tdemidFrame(const char *name) setAcceptDrops(true); - connect( tdemidclient, TQT_SIGNAL( mustRechooseTextEvent() ), - this, TQT_SLOT( rechooseTextEvent() ) ); + connect( tdemidclient, TQ_SIGNAL( mustRechooseTextEvent() ), + this, TQ_SLOT( rechooseTextEvent() ) ); - connect( tdemidclient, TQT_SIGNAL( stopPause() ), - this, TQT_SLOT( song_stopPause() ) ); + connect( tdemidclient, TQ_SIGNAL( stopPause() ), + this, TQ_SLOT( song_stopPause() ) ); -// connect( tdemidclient, TQT_SIGNAL( channelView_Destroyed() ), -// this, TQT_SLOT( channelViewDestroyed() ) ); +// connect( tdemidclient, TQ_SIGNAL( channelView_Destroyed() ), +// this, TQ_SLOT( channelViewDestroyed() ) ); TDECmdLineArgs * args = TDECmdLineArgs::parsedArgs(); @@ -230,7 +230,7 @@ tdemidFrame::tdemidFrame(const char *name) cfg->writeEntry("AutoAddToCollection",0); char ttt[40]; - sprintf(ttt,"%d",kapp->argc()); + sprintf(ttt,"%d",tdeApp->argc()); int i=0; int c=autoAddSongToCollection( args->url( 0 ).path() , 1 ); i++; @@ -242,7 +242,7 @@ tdemidFrame::tdemidFrame(const char *name) tdemidclient->setActiveCollection(c); - /// tdemidclient->openURL((kapp->argv())[1]); + /// tdemidclient->openURL((tdeApp->argv())[1]); /* if ((cfg->readNumEntry("AutomaticTextEventChooser",1))==1) { if (tdemidclient->ChooseTypeOfTextEvents()==1) @@ -258,11 +258,11 @@ tdemidFrame::tdemidFrame(const char *name) /* kKeys->addKey("Play/Pause",Key_Space); kKeys->registerWidget("KMidFrame",this); - kKeys->connectFunction("KMidFrame","Play/Pause",this,TQT_SLOT(spacePressed())); + kKeys->connectFunction("KMidFrame","Play/Pause",this,TQ_SLOT(spacePressed())); */ // kKeysAccel->writeSettings(cfg); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if (!client->isRegistered()) // just in case we're embeeded { client->attach(); @@ -304,7 +304,7 @@ void tdemidFrame::song_stopPause() void tdemidFrame::options_FileType(int i) { - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); cfg->writeEntry("TypeOfMidiFile",i); tdemidclient->setSongType(1-i); @@ -312,7 +312,7 @@ void tdemidFrame::options_FileType(int i) void tdemidFrame::options_DisplayEvents(int i) { - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); cfg->writeEntry("TypeOfTextEvents",(i==0)?1:5); cfg->sync(); @@ -321,7 +321,7 @@ void tdemidFrame::options_DisplayEvents(int i) void tdemidFrame::options_AutomaticText() { - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); cfg->writeEntry("AutomaticTextEventChooser",1-cfg->readNumEntry("AutomaticTextEventChooser",1)); } @@ -333,7 +333,7 @@ void tdemidFrame::options_FontChange() font=*tdemidclient->getFont(); kfd->getFont(font); delete kfd; - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); cfg->writeEntry("KaraokeFont",font); cfg->sync(); @@ -345,7 +345,7 @@ int tdemidFrame::autoAddSongToCollection(const TQString& filename,int setactive) int r; SLManager *slman; SongList *sl; - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); if (cfg->readNumEntry("AutoAddToCollection",0)==0) { @@ -474,7 +474,7 @@ void tdemidFrame::options_MidiSetup() dlg=new MidiConfigDialog(tdemidclient->devman(),NULL,"MidiDialog"); if (dlg->exec() == TQDialog::Accepted) { - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); cfg->writeEntry("MidiPortNumber",MidiConfigDialog::selecteddevice); tdemidclient->setMidiDevice(MidiConfigDialog::selecteddevice); @@ -509,7 +509,7 @@ delete dlg; void tdemidFrame::rechooseTextEvent() { - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); if ((cfg->readNumEntry("AutomaticTextEventChooser",1))==1) { @@ -524,7 +524,7 @@ void tdemidFrame::rechooseTextEvent() void tdemidFrame::song_Loop() { - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); int i=1-cfg->readNumEntry("Loop",0); cfg->writeEntry("Loop",i); @@ -534,7 +534,7 @@ void tdemidFrame::song_Loop() void tdemidFrame::collect_PlayOrder(int i) { - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); cfg->writeEntry("CollectionPlayMode", i); cfg->sync(); @@ -543,7 +543,7 @@ void tdemidFrame::collect_PlayOrder(int i) void tdemidFrame::collect_AutoAdd() { - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); cfg->writeEntry("AutoAddToCollection",1-cfg->readNumEntry("AutoAddToCollection",0)); cfg->sync(); @@ -584,7 +584,7 @@ void tdemidFrame::spacePressed() } void tdemidFrame::options_ShowVolumeBar() { - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); int i=1-cfg->readNumEntry("ShowVolumeBar",0); cfg->writeEntry("ShowVolumeBar",i); @@ -599,7 +599,7 @@ void tdemidFrame::options_ShowChannelView() } else { tdemidclient->visibleChannelView(1); - connect (tdemidclient->getChannelView(),TQT_SIGNAL(destroyMe()),this,TQT_SLOT(channelViewDestroyed())); + connect (tdemidclient->getChannelView(),TQ_SIGNAL(destroyMe()),this,TQ_SLOT(channelViewDestroyed())); } } diff --git a/tdemid/tdemidframe.h b/tdemid/tdemidframe.h index 864be3de..247e6745 100644 --- a/tdemid/tdemidframe.h +++ b/tdemid/tdemidframe.h @@ -39,7 +39,7 @@ class TDEToolBar; class TQDragEvent; class TDEAccel; -class KDE_EXPORT tdemidFrame : public TDEMainWindow +class TDE_EXPORT tdemidFrame : public TDEMainWindow { TQ_OBJECT diff --git a/translations/desktop_files/artsbuilder-desktops/es_AR.po b/translations/desktop_files/artsbuilder-desktops/es_AR.po new file mode 100644 index 00000000..14e12d64 --- /dev/null +++ b/translations/desktop_files/artsbuilder-desktops/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-29 12:55+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: artsbuilder.desktop:2 +msgid "aRts Builder" +msgstr "" + +#. GenericName +#: artsbuilder.desktop:3 +msgid "Audio Filter Designer" +msgstr "" + +#. Comment +#: x-artsbuilder.desktop:3 +msgid "Arts Builder" +msgstr "" diff --git a/translations/desktop_files/artscontrol-desktops/es_AR.po b/translations/desktop_files/artscontrol-desktops/es_AR.po new file mode 100644 index 00000000..c86041a5 --- /dev/null +++ b/translations/desktop_files/artscontrol-desktops/es_AR.po @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-29 13:15+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: artscontrol.desktop:2 +msgid "aRts Control Tool" +msgstr "" + +#. GenericName +#: artscontrol.desktop:3 +msgid "Sound Server Control" +msgstr "" + +#. Comment +#: artscontrolapplet.desktop:3 +msgid "Control the aRts sound server" +msgstr "" + +#. Name +#: artscontrolapplet.desktop:4 +msgid "aRts Control" +msgstr "" diff --git a/translations/desktop_files/juk-desktops/es_AR.po b/translations/desktop_files/juk-desktops/es_AR.po new file mode 100644 index 00000000..8e753040 --- /dev/null +++ b/translations/desktop_files/juk-desktops/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-29 13:04+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: juk.desktop:8 +msgid "JuK" +msgstr "" + +#. GenericName +#: juk.desktop:10 +msgid "Music Player" +msgstr "" + +#. Name +#: jukservicemenu.desktop:6 +msgid "Add to JuK Collection" +msgstr "" diff --git a/translations/desktop_files/kaboodle-desktops/es_AR.po b/translations/desktop_files/kaboodle-desktops/es_AR.po new file mode 100644 index 00000000..ee14f45d --- /dev/null +++ b/translations/desktop_files/kaboodle-desktops/es_AR.po @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-29 13:15+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kaboodle.desktop:9 +msgid "Kaboodle" +msgstr "" + +#. GenericName +#: kaboodle.desktop:11 +msgid "Media Player" +msgstr "" + +#. Name +#: kaboodle_component.desktop:2 +msgid "Embedded Media Player" +msgstr "" + +#. Name +#: kaboodleengine.desktop:2 +msgid "Embedded Media Player Engine" +msgstr "" diff --git a/translations/desktop_files/kappfinder-data/es_AR.po b/translations/desktop_files/kappfinder-data/es_AR.po new file mode 100644 index 00000000..813b2dc7 --- /dev/null +++ b/translations/desktop_files/kappfinder-data/es_AR.po @@ -0,0 +1,195 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-31 20:34+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: tde-multimedia-music.directory:3 +msgid "Music" +msgstr "" + +#. GenericName +#: tde-multimedia-music.directory:4 +msgid "Professional Audio" +msgstr "" + +#. Name +#: ams.desktop:4 +msgid "ams" +msgstr "" + +#. GenericName +#: ams.desktop:5 +msgid "Alsa Modular Synthesizer" +msgstr "" + +#. Name +#: amsynth.desktop:4 +msgid "amSynth" +msgstr "" + +#. GenericName +#: amsynth.desktop:5 +msgid "Retro Analog - Modeling Softsynth" +msgstr "" + +#. Name +#: ardour.desktop:4 +msgid "Ardour" +msgstr "" + +#. GenericName +#: ardour.desktop:5 +msgid "Multitrack Audio Studio" +msgstr "" + +#. Name +#: djplay.desktop:4 +msgid "DJPlay" +msgstr "" + +#. GenericName +#: djplay.desktop:5 mixxx.desktop:5 +msgid "DJ-Mixer and Player" +msgstr "" + +#. Name +#: ecamegapedal.desktop:4 +msgid "EcaMegaPedal" +msgstr "" + +#. GenericName +#: ecamegapedal.desktop:5 +msgid "Ecasound Effektrack" +msgstr "" + +#. Name +#: freebirth.desktop:4 +msgid "FreeBirth" +msgstr "" + +#. GenericName +#: freebirth.desktop:5 hydrogen.desktop:5 +msgid "Drum Machine" +msgstr "" + +#. Name +#: freqtweak.desktop:4 +msgid "FreqTweak" +msgstr "" + +#. GenericName +#: freqtweak.desktop:5 +msgid "Effects for Jack" +msgstr "" + +#. Name +#: galan.desktop:4 +msgid "gAlan" +msgstr "" + +#. GenericName +#: galan.desktop:5 +msgid "Modular Synth" +msgstr "" + +#. Name +#: hydrogen.desktop:4 +msgid "Hydrogen" +msgstr "" + +#. Name +#: jack-rack.desktop:4 +msgid "Jack-Rack" +msgstr "" + +#. GenericName +#: jack-rack.desktop:5 +msgid "Jack Effectrack" +msgstr "" + +#. Name +#: jamin.desktop:4 +msgid "Jamin" +msgstr "" + +#. GenericName +#: jamin.desktop:5 +msgid "Jack Mastering Tool" +msgstr "" + +#. GenericName +#: meterbridge.desktop:8 +msgid "Dual Channel VU-Meter" +msgstr "" + +#. Name +#: meterbridge.desktop:9 +msgid "Meterbridge" +msgstr "" + +#. Name +#: mixxx.desktop:4 +msgid "Mixxx" +msgstr "" + +#. Name +#: muse.desktop:3 +msgid "MusE" +msgstr "" + +#. GenericName +#: muse.desktop:5 +msgid "Music Sequencer" +msgstr "" + +#. Name +#: qjackctl.desktop:4 +msgid "QJackCtl" +msgstr "" + +#. GenericName +#: qjackctl.desktop:5 +msgid "Control for Jack" +msgstr "" + +#. Name +#: qsynth.desktop:4 +msgid "QSynth" +msgstr "" + +#. GenericName +#: qsynth.desktop:5 +msgid "Control for FluidSynth" +msgstr "" + +#. Name +#: vkeybd.desktop:4 +msgid "vkeybd" +msgstr "" + +#. GenericName +#: vkeybd.desktop:5 +msgid "Virtual MIDI Keyboard" +msgstr "" + +#. Name +#: zynaddsubfx.desktop:4 +msgid "ZynaddsubFX" +msgstr "" + +#. GenericName +#: zynaddsubfx.desktop:5 +msgid "Soft Synth" +msgstr "" diff --git a/translations/desktop_files/kaudiocreator-desktops/es_AR.po b/translations/desktop_files/kaudiocreator-desktops/es_AR.po new file mode 100644 index 00000000..e85b78e0 --- /dev/null +++ b/translations/desktop_files/kaudiocreator-desktops/es_AR.po @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-29 13:30+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: audiocd_extract.desktop:7 +msgid "Extract and Encode Audio Tracks" +msgstr "" + +#. Name +#: kaudiocreator.desktop:2 +msgid "KAudioCreator" +msgstr "" + +#. GenericName +#: kaudiocreator.desktop:4 +msgid "CD Ripper" +msgstr "" + +#. Comment +#: kaudiocreator.desktop:6 +msgid "Frontend for audio file creation" +msgstr "" diff --git a/translations/desktop_files/kaudiocreator-eventsrc/es_AR.po b/translations/desktop_files/kaudiocreator-eventsrc/es_AR.po new file mode 100644 index 00000000..affebe6a --- /dev/null +++ b/translations/desktop_files/kaudiocreator-eventsrc/es_AR.po @@ -0,0 +1,70 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-29 13:30+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Comment +#: eventsrc:3 +msgid "KAudioCreator" +msgstr "" + +#. Name +#: eventsrc:6 +msgid "All jobs finished" +msgstr "" + +#. Comment +#: eventsrc:7 +msgid "All of the jobs in the queue have been finished" +msgstr "" + +#. Name +#: eventsrc:10 +msgid "Track Ripped" +msgstr "" + +#. Comment +#: eventsrc:11 +msgid "Track finished ripping" +msgstr "" + +#. Name +#: eventsrc:14 +msgid "CD Ripped" +msgstr "" + +#. Comment +#: eventsrc:15 +msgid "CD finished ripping" +msgstr "" + +#. Name +#: eventsrc:18 +msgid "Track Encoded" +msgstr "" + +#. Comment +#: eventsrc:19 +msgid "Track finished encoding" +msgstr "" + +#. Name +#: eventsrc:22 +msgid "CD Encoded" +msgstr "" + +#. Comment +#: eventsrc:23 +msgid "CD finished encoding" +msgstr "" diff --git a/translations/desktop_files/kmix-desktops/es_AR.po b/translations/desktop_files/kmix-desktops/es_AR.po new file mode 100644 index 00000000..c27597c7 --- /dev/null +++ b/translations/desktop_files/kmix-desktops/es_AR.po @@ -0,0 +1,49 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-29 13:37+0200\n" +"PO-Revision-Date: 2025-03-15 12:44+0000\n" +"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n" +"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/" +"weblate/projects/tdemultimedia/kmix-desktop-files/es_AR/>\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" + +#. Name +#: kmix.desktop:11 +#, fuzzy +msgid "KMix" +msgstr "KMix" + +#. GenericName +#. Name +#: kmix.desktop:13 kmixapplet.desktop:3 +msgid "Sound Mixer" +msgstr "Mezclador audio" + +#. Comment +#: kmixapplet.desktop:5 +#, fuzzy +msgid "Volume and sound channel mixer control" +msgstr "Control del volumen y los canales de sonido del mezclador" + +#. Name +#: kmixctrl_restore.desktop:3 +#, fuzzy +msgid "Restore Mixer Settings" +msgstr "Restaurar opciones del mezclador" + +#. Name +#: restore_kmix_volumes.desktop:7 +#, fuzzy +msgid "Restore Mixer Volumes" +msgstr "Restaurar opciones del mezclador" diff --git a/translations/desktop_files/krec-desktops/es_AR.po b/translations/desktop_files/krec-desktops/es_AR.po new file mode 100644 index 00000000..cee57485 --- /dev/null +++ b/translations/desktop_files/krec-desktops/es_AR.po @@ -0,0 +1,65 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-29 13:46+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: krec.desktop:9 +msgid "KRec" +msgstr "" + +#. GenericName +#: krec.desktop:11 +msgid "Recording Tool" +msgstr "" + +#. Name +#: kcm_krec.desktop:12 +msgid "Global" +msgstr "" + +#. Comment +#: kcm_krec.desktop:13 +msgid "Global Configuration" +msgstr "" + +#. Name +#: kcm_krec_files.desktop:12 +msgid "New Files" +msgstr "" + +#. Comment +#: kcm_krec_files.desktop:13 +msgid "Default Properties for New Files" +msgstr "" + +#. Comment +#: krec_exportitem.desktop:4 +msgid "Exportplugin for KRec" +msgstr "" + +#. Name +#: krec_exportwave.desktop:3 +msgid "Wave-Export" +msgstr "" + +#. Name +#: mp3_export/krec_exportmp3.desktop:3 +msgid "MP3-Export" +msgstr "" + +#. Name +#: ogg_export/krec_exportogg.desktop:3 +msgid "OGG-Export" +msgstr "" diff --git a/translations/desktop_files/kscd-desktops/es_AR.po b/translations/desktop_files/kscd-desktops/es_AR.po new file mode 100644 index 00000000..c7b2e482 --- /dev/null +++ b/translations/desktop_files/kscd-desktops/es_AR.po @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-29 14:48+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: audiocd_play.desktop:7 +msgid "Play" +msgstr "" + +#. Name +#: kscd.desktop:3 +msgid "KsCD" +msgstr "" + +#. GenericName +#: kscd.desktop:5 +msgid "CD Player" +msgstr "" + +#. Comment +#: xmcd.desktop:2 +msgid "CD Database File" +msgstr "" diff --git a/translations/desktop_files/libkcddb.desktop/es_AR.po b/translations/desktop_files/libkcddb.desktop/es_AR.po new file mode 100644 index 00000000..7dd2dcb0 --- /dev/null +++ b/translations/desktop_files/libkcddb.desktop/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-29 14:42+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: libkcddb.desktop:10 +msgid "CDDB Retrieval" +msgstr "" + +#. Comment +#: libkcddb.desktop:12 +msgid "Configure the CDDB Retrieval" +msgstr "" + +#. Keywords +#: libkcddb.desktop:14 +msgid "cddb;" +msgstr "" diff --git a/translations/desktop_files/noatun-desktops/es_AR.po b/translations/desktop_files/noatun-desktops/es_AR.po new file mode 100644 index 00000000..2fd77251 --- /dev/null +++ b/translations/desktop_files/noatun-desktops/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-29 14:54+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: noatun.desktop:8 +msgid "Noatun" +msgstr "" + +#. GenericName +#: noatun.desktop:10 +msgid "Media Player" +msgstr "" + +#. Comment +#: modules/winskin/mimetypes/interface/x-winamp-skin.desktop:6 +msgid "Compressed Winamp Skin" +msgstr "" diff --git a/translations/desktop_files/tdefile-desktops/af.po b/translations/desktop_files/tdefile-desktops/af.po index 32c91587..9e49b7ae 100644 --- a/translations/desktop_files/tdefile-desktops/af.po +++ b/translations/desktop_files/tdefile-desktops/af.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -43,6 +43,13 @@ msgid "MP3 Info" msgstr "Mp3 Inligting" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "Mp3 Inligting" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "" diff --git a/translations/desktop_files/tdefile-desktops/ar.po b/translations/desktop_files/tdefile-desktops/ar.po index 2e257292..4a0351fa 100644 --- a/translations/desktop_files/tdefile-desktops/ar.po +++ b/translations/desktop_files/tdefile-desktops/ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -45,6 +45,13 @@ msgid "MP3 Info" msgstr "معلومات MP3" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "معلومات MP3" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "" diff --git a/translations/desktop_files/tdefile-desktops/az.po b/translations/desktop_files/tdefile-desktops/az.po index ba98fb0b..b20834b0 100644 --- a/translations/desktop_files/tdefile-desktops/az.po +++ b/translations/desktop_files/tdefile-desktops/az.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,11 @@ msgid "MP3 Info" msgstr "" #. Name +#: mp4/tdefile_mp4.desktop:3 +msgid "MP4 Info" +msgstr "" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "" diff --git a/translations/desktop_files/tdefile-desktops/bg.po b/translations/desktop_files/tdefile-desktops/bg.po index f09a81c8..c179400c 100644 --- a/translations/desktop_files/tdefile-desktops/bg.po +++ b/translations/desktop_files/tdefile-desktops/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "Информация за MP3" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "Информация за MP3" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Информация за Musepack" diff --git a/translations/desktop_files/tdefile-desktops/bn.po b/translations/desktop_files/tdefile-desktops/bn.po index f743fa90..332ae0a9 100644 --- a/translations/desktop_files/tdefile-desktops/bn.po +++ b/translations/desktop_files/tdefile-desktops/bn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -43,6 +43,13 @@ msgid "MP3 Info" msgstr "এম-পি-৩ (MP3) তথ্য" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "এম-পি-৩ (MP3) তথ্য" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "" diff --git a/translations/desktop_files/tdefile-desktops/br.po b/translations/desktop_files/tdefile-desktops/br.po index 17e0cfc1..acb278f5 100644 --- a/translations/desktop_files/tdefile-desktops/br.po +++ b/translations/desktop_files/tdefile-desktops/br.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "Titouroù MP3" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "Titouroù MP3" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Titouroù Musepack" diff --git a/translations/desktop_files/tdefile-desktops/bs.po b/translations/desktop_files/tdefile-desktops/bs.po index ebad80a9..cc60c5a2 100644 --- a/translations/desktop_files/tdefile-desktops/bs.po +++ b/translations/desktop_files/tdefile-desktops/bs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3 informacije" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3 informacije" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Musepack informacije" diff --git a/translations/desktop_files/tdefile-desktops/ca.po b/translations/desktop_files/tdefile-desktops/ca.po index 2f2cb5f9..8d9c8605 100644 --- a/translations/desktop_files/tdefile-desktops/ca.po +++ b/translations/desktop_files/tdefile-desktops/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "Informació MP3" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "Informació MP3" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Informació Musepack" diff --git a/translations/desktop_files/tdefile-desktops/cs.po b/translations/desktop_files/tdefile-desktops/cs.po index d55447c8..7e6150c9 100644 --- a/translations/desktop_files/tdefile-desktops/cs.po +++ b/translations/desktop_files/tdefile-desktops/cs.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" +"PO-Revision-Date: 2025-04-02 01:44+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdemultimedia/tdefile-desktop-files/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: au/tdefile_au.desktop:3 @@ -42,6 +43,11 @@ msgid "MP3 Info" msgstr "MP3 info" #. Name +#: mp4/tdefile_mp4.desktop:3 +msgid "MP4 Info" +msgstr "MP4 info" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Musepack info" diff --git a/translations/desktop_files/tdefile-desktops/cy.po b/translations/desktop_files/tdefile-desktops/cy.po index c5dd3356..e1128363 100644 --- a/translations/desktop_files/tdefile-desktops/cy.po +++ b/translations/desktop_files/tdefile-desktops/cy.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "Gwybodaeth MP3" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "Gwybodaeth MP3" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "" diff --git a/translations/desktop_files/tdefile-desktops/da.po b/translations/desktop_files/tdefile-desktops/da.po index 4b43a53a..762149f6 100644 --- a/translations/desktop_files/tdefile-desktops/da.po +++ b/translations/desktop_files/tdefile-desktops/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3-info" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3-info" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "" diff --git a/translations/desktop_files/tdefile-desktops/de.po b/translations/desktop_files/tdefile-desktops/de.po index 1ae3df83..2314f4bf 100644 --- a/translations/desktop_files/tdefile-desktops/de.po +++ b/translations/desktop_files/tdefile-desktops/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3-Info" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3-Info" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Musepack-Info" diff --git a/translations/desktop_files/tdefile-desktops/el.po b/translations/desktop_files/tdefile-desktops/el.po index 6db36420..2c07405b 100644 --- a/translations/desktop_files/tdefile-desktops/el.po +++ b/translations/desktop_files/tdefile-desktops/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "Πληροφορίες MP3" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "Πληροφορίες MP3" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Πληροφορίες Musepack" diff --git a/translations/desktop_files/tdefile-desktops/eo.po b/translations/desktop_files/tdefile-desktops/eo.po index e6bf3802..0aab8646 100644 --- a/translations/desktop_files/tdefile-desktops/eo.po +++ b/translations/desktop_files/tdefile-desktops/eo.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -43,6 +43,13 @@ msgid "MP3 Info" msgstr "MP3-informo" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3-informo" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "epack-informo" diff --git a/translations/desktop_files/tdefile-desktops/es.po b/translations/desktop_files/tdefile-desktops/es.po index 95945c6b..d21ac2e7 100644 --- a/translations/desktop_files/tdefile-desktops/es.po +++ b/translations/desktop_files/tdefile-desktops/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "Info MP3" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "Info MP3" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Info Musepack" diff --git a/translations/desktop_files/tdefile-desktops/es_AR.po b/translations/desktop_files/tdefile-desktops/es_AR.po new file mode 100644 index 00000000..fc4e7170 --- /dev/null +++ b/translations/desktop_files/tdefile-desktops/es_AR.po @@ -0,0 +1,75 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: au/tdefile_au.desktop:3 +msgid "AU Info" +msgstr "" + +#. Name +#: avi/tdefile_avi.desktop:3 +msgid "AVI Info" +msgstr "" + +#. Name +#: flac/tdefile_flac.desktop:3 +msgid "FLAC Info" +msgstr "" + +#. Name +#: m3u/tdefile_m3u.desktop:3 +msgid "M3U Playlist Info" +msgstr "" + +#. Name +#: mp3/tdefile_mp3.desktop:3 +msgid "MP3 Info" +msgstr "" + +#. Name +#: mp4/tdefile_mp4.desktop:3 +msgid "MP4 Info" +msgstr "" + +#. Name +#: mpc/tdefile_mpc.desktop:3 +msgid "Musepack Info" +msgstr "" + +#. Name +#: mpeg/tdefile_mpeg.desktop:3 +msgid "MPEG Info" +msgstr "" + +#. Name +#: ogg/tdefile_ogg.desktop:3 +msgid "OGG Info" +msgstr "" + +#. Name +#: sid/tdefile_sid.desktop:3 +msgid "SID Info" +msgstr "" + +#. Name +#: theora/tdefile_theora.desktop:3 +msgid "theora Info" +msgstr "" + +#. Name +#: wav/tdefile_wav.desktop:3 +msgid "WAV Info" +msgstr "" diff --git a/translations/desktop_files/tdefile-desktops/et.po b/translations/desktop_files/tdefile-desktops/et.po index c56056d2..1038ce1a 100644 --- a/translations/desktop_files/tdefile-desktops/et.po +++ b/translations/desktop_files/tdefile-desktops/et.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3 info" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3 info" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Musepacki info" diff --git a/translations/desktop_files/tdefile-desktops/eu.po b/translations/desktop_files/tdefile-desktops/eu.po index 264f92fa..87db602e 100644 --- a/translations/desktop_files/tdefile-desktops/eu.po +++ b/translations/desktop_files/tdefile-desktops/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3 informazioa" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3 informazioa" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Musepack informazioa" diff --git a/translations/desktop_files/tdefile-desktops/fa.po b/translations/desktop_files/tdefile-desktops/fa.po index f0fb2fd5..a2f4e806 100644 --- a/translations/desktop_files/tdefile-desktops/fa.po +++ b/translations/desktop_files/tdefile-desktops/fa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "اطلاعات MP3" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "اطلاعات MP3" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "اطلاعات Musepack" diff --git a/translations/desktop_files/tdefile-desktops/fi.po b/translations/desktop_files/tdefile-desktops/fi.po index 2b4c9991..f80e8e37 100644 --- a/translations/desktop_files/tdefile-desktops/fi.po +++ b/translations/desktop_files/tdefile-desktops/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3-tiedot" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3-tiedot" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Musepack-tiedot" diff --git a/translations/desktop_files/tdefile-desktops/fr.po b/translations/desktop_files/tdefile-desktops/fr.po index d7b279cb..ccad50f0 100644 --- a/translations/desktop_files/tdefile-desktops/fr.po +++ b/translations/desktop_files/tdefile-desktops/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "Informations Mpeg3" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "Informations Mpeg3" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Informations Musepack" diff --git a/translations/desktop_files/tdefile-desktops/ga.po b/translations/desktop_files/tdefile-desktops/ga.po index b0e3b3b5..b309abff 100644 --- a/translations/desktop_files/tdefile-desktops/ga.po +++ b/translations/desktop_files/tdefile-desktops/ga.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -45,6 +45,12 @@ msgid "MP3 Info" msgstr "Eolas MPEG" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +msgid "MP4 Info" +msgstr "Eolas MPEG" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Eolas faoi Musepack" diff --git a/translations/desktop_files/tdefile-desktops/gl.po b/translations/desktop_files/tdefile-desktops/gl.po index fadf06fd..4af1dcc9 100644 --- a/translations/desktop_files/tdefile-desktops/gl.po +++ b/translations/desktop_files/tdefile-desktops/gl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "Información MP3" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "Información MP3" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Información Musepack" diff --git a/translations/desktop_files/tdefile-desktops/he.po b/translations/desktop_files/tdefile-desktops/he.po index 464cb9df..ca0e9e36 100644 --- a/translations/desktop_files/tdefile-desktops/he.po +++ b/translations/desktop_files/tdefile-desktops/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "מידע MP3" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "מידע MP3" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "מידע Musepack" diff --git a/translations/desktop_files/tdefile-desktops/hi.po b/translations/desktop_files/tdefile-desktops/hi.po index 65172f9c..7a23eb2a 100644 --- a/translations/desktop_files/tdefile-desktops/hi.po +++ b/translations/desktop_files/tdefile-desktops/hi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3 जानकारी" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3 जानकारी" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "" diff --git a/translations/desktop_files/tdefile-desktops/hr.po b/translations/desktop_files/tdefile-desktops/hr.po index 306e9aca..eda824ac 100644 --- a/translations/desktop_files/tdefile-desktops/hr.po +++ b/translations/desktop_files/tdefile-desktops/hr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -43,6 +43,13 @@ msgid "MP3 Info" msgstr "Informacije o MP3 datoteci" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "Informacije o MP3 datoteci" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "" diff --git a/translations/desktop_files/tdefile-desktops/hu.po b/translations/desktop_files/tdefile-desktops/hu.po index e64dc416..ac4c7240 100644 --- a/translations/desktop_files/tdefile-desktops/hu.po +++ b/translations/desktop_files/tdefile-desktops/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3-jellemzők" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3-jellemzők" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Musepack-jellemzők" diff --git a/translations/desktop_files/tdefile-desktops/is.po b/translations/desktop_files/tdefile-desktops/is.po index 9e6c4e20..aa354b90 100644 --- a/translations/desktop_files/tdefile-desktops/is.po +++ b/translations/desktop_files/tdefile-desktops/is.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3 upplýsingar" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3 upplýsingar" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Musepack upplýsingar" diff --git a/translations/desktop_files/tdefile-desktops/it.po b/translations/desktop_files/tdefile-desktops/it.po index b8bf0b37..435b96fc 100644 --- a/translations/desktop_files/tdefile-desktops/it.po +++ b/translations/desktop_files/tdefile-desktops/it.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" +"PO-Revision-Date: 2025-04-12 01:44+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdemultimedia/tdefile-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: au/tdefile_au.desktop:3 @@ -42,6 +43,11 @@ msgid "MP3 Info" msgstr "Informazioni MP3" #. Name +#: mp4/tdefile_mp4.desktop:3 +msgid "MP4 Info" +msgstr "Informazioni MP4" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Informazioni Musepack" diff --git a/translations/desktop_files/tdefile-desktops/ja.po b/translations/desktop_files/tdefile-desktops/ja.po index 0c230115..21ba5be5 100644 --- a/translations/desktop_files/tdefile-desktops/ja.po +++ b/translations/desktop_files/tdefile-desktops/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3 情報" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3 情報" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Musepack 情報" diff --git a/translations/desktop_files/tdefile-desktops/kk.po b/translations/desktop_files/tdefile-desktops/kk.po index d4e71f2e..71513d7d 100644 --- a/translations/desktop_files/tdefile-desktops/kk.po +++ b/translations/desktop_files/tdefile-desktops/kk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3 мәліметі" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3 мәліметі" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Musepack мәліметі" diff --git a/translations/desktop_files/tdefile-desktops/km.po b/translations/desktop_files/tdefile-desktops/km.po index f3937523..e5037506 100644 --- a/translations/desktop_files/tdefile-desktops/km.po +++ b/translations/desktop_files/tdefile-desktops/km.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "ព័ត៌មាន MP3" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "ព័ត៌មាន MP3" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "ព័ត៌មាន Musepack" diff --git a/translations/desktop_files/tdefile-desktops/ko.po b/translations/desktop_files/tdefile-desktops/ko.po index cdda76bf..e02176a3 100644 --- a/translations/desktop_files/tdefile-desktops/ko.po +++ b/translations/desktop_files/tdefile-desktops/ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3 정보" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3 정보" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Musepack 정보" diff --git a/translations/desktop_files/tdefile-desktops/lt.po b/translations/desktop_files/tdefile-desktops/lt.po index 4db3b2a0..c0becd3f 100644 --- a/translations/desktop_files/tdefile-desktops/lt.po +++ b/translations/desktop_files/tdefile-desktops/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3 informacija" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3 informacija" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Musepack informacija" diff --git a/translations/desktop_files/tdefile-desktops/lv.po b/translations/desktop_files/tdefile-desktops/lv.po index 31d7196f..eb392c62 100644 --- a/translations/desktop_files/tdefile-desktops/lv.po +++ b/translations/desktop_files/tdefile-desktops/lv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,11 @@ msgid "MP3 Info" msgstr "" #. Name +#: mp4/tdefile_mp4.desktop:3 +msgid "MP4 Info" +msgstr "" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "" diff --git a/translations/desktop_files/tdefile-desktops/mk.po b/translations/desktop_files/tdefile-desktops/mk.po index a5deb4a8..0b5004b8 100644 --- a/translations/desktop_files/tdefile-desktops/mk.po +++ b/translations/desktop_files/tdefile-desktops/mk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3 информации" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3 информации" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Musepack информации" diff --git a/translations/desktop_files/tdefile-desktops/nb.po b/translations/desktop_files/tdefile-desktops/nb.po index e9762a9a..162c8354 100644 --- a/translations/desktop_files/tdefile-desktops/nb.po +++ b/translations/desktop_files/tdefile-desktops/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3 informasjon" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3 informasjon" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Musepack-info" diff --git a/translations/desktop_files/tdefile-desktops/nds.po b/translations/desktop_files/tdefile-desktops/nds.po index 6af745bf..cfffe9a9 100644 --- a/translations/desktop_files/tdefile-desktops/nds.po +++ b/translations/desktop_files/tdefile-desktops/nds.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3-Info" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3-Info" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Musepack-Info" diff --git a/translations/desktop_files/tdefile-desktops/ne.po b/translations/desktop_files/tdefile-desktops/ne.po index ff03f1e5..1a94ee91 100644 --- a/translations/desktop_files/tdefile-desktops/ne.po +++ b/translations/desktop_files/tdefile-desktops/ne.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3 सूचना" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3 सूचना" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "म्युजप्याक सूचना" diff --git a/translations/desktop_files/tdefile-desktops/nl.po b/translations/desktop_files/tdefile-desktops/nl.po index 2de5b29f..d978a4b6 100644 --- a/translations/desktop_files/tdefile-desktops/nl.po +++ b/translations/desktop_files/tdefile-desktops/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3-informatie" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3-informatie" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Musepack-informatie" diff --git a/translations/desktop_files/tdefile-desktops/nn.po b/translations/desktop_files/tdefile-desktops/nn.po index 7ca7a612..cfe89513 100644 --- a/translations/desktop_files/tdefile-desktops/nn.po +++ b/translations/desktop_files/tdefile-desktops/nn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3-info" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3-info" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Musepack-info" diff --git a/translations/desktop_files/tdefile-desktops/pa.po b/translations/desktop_files/tdefile-desktops/pa.po index b452cbc4..3af65c55 100644 --- a/translations/desktop_files/tdefile-desktops/pa.po +++ b/translations/desktop_files/tdefile-desktops/pa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3 ਜਾਣਕਾਰੀ" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3 ਜਾਣਕਾਰੀ" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Musepack ਜਾਣਕਾਰੀ" diff --git a/translations/desktop_files/tdefile-desktops/pl.po b/translations/desktop_files/tdefile-desktops/pl.po index 96f0bd90..6cfa63e6 100644 --- a/translations/desktop_files/tdefile-desktops/pl.po +++ b/translations/desktop_files/tdefile-desktops/pl.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Jan Stolarek <jan.stolarek@mailbox.org>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" +"PO-Revision-Date: 2025-03-30 21:44+0000\n" +"Last-Translator: Jan Stolarek <jan.stolarek@mailbox.org>\n" +"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdemultimedia/tdefile-desktop-files/pl/>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: au/tdefile_au.desktop:3 @@ -42,6 +44,11 @@ msgid "MP3 Info" msgstr "Informacja o pliku MP3" #. Name +#: mp4/tdefile_mp4.desktop:3 +msgid "MP4 Info" +msgstr "Informacja o pliku MP4" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Informacja Musepack" diff --git a/translations/desktop_files/tdefile-desktops/pt.po b/translations/desktop_files/tdefile-desktops/pt.po index a2ceb6c7..ca0ffef7 100644 --- a/translations/desktop_files/tdefile-desktops/pt.po +++ b/translations/desktop_files/tdefile-desktops/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "Informação do MP3" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "Informação do MP3" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Informação do Musepack" diff --git a/translations/desktop_files/tdefile-desktops/pt_BR.po b/translations/desktop_files/tdefile-desktops/pt_BR.po index 41a78b48..1a1593ad 100644 --- a/translations/desktop_files/tdefile-desktops/pt_BR.po +++ b/translations/desktop_files/tdefile-desktops/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "Informações sobre MP3 " #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "Informações sobre MP3 " + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Informações sobre Musepack" diff --git a/translations/desktop_files/tdefile-desktops/ro.po b/translations/desktop_files/tdefile-desktops/ro.po index 4f43a7da..828b1686 100644 --- a/translations/desktop_files/tdefile-desktops/ro.po +++ b/translations/desktop_files/tdefile-desktops/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "Informaţii MP3" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "Informaţii MP3" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Informaţii Musepack" diff --git a/translations/desktop_files/tdefile-desktops/ru.po b/translations/desktop_files/tdefile-desktops/ru.po index 252140cd..f81f85b3 100644 --- a/translations/desktop_files/tdefile-desktops/ru.po +++ b/translations/desktop_files/tdefile-desktops/ru.po @@ -1,30 +1,32 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" +"PO-Revision-Date: 2025-05-01 14:59+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdemultimedia/tdefile-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: au/tdefile_au.desktop:3 msgid "AU Info" -msgstr "Сведения о AU" +msgstr "Сведения об AU" #. Name #: avi/tdefile_avi.desktop:3 msgid "AVI Info" -msgstr "Сведения о AVI" +msgstr "Сведения об AVI" #. Name #: flac/tdefile_flac.desktop:3 @@ -42,6 +44,11 @@ msgid "MP3 Info" msgstr "Сведения о MP3" #. Name +#: mp4/tdefile_mp4.desktop:3 +msgid "MP4 Info" +msgstr "Сведения MP4" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Сведения о Musepack" diff --git a/translations/desktop_files/tdefile-desktops/rw.po b/translations/desktop_files/tdefile-desktops/rw.po index 8225518c..4de54fe2 100644 --- a/translations/desktop_files/tdefile-desktops/rw.po +++ b/translations/desktop_files/tdefile-desktops/rw.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -44,6 +44,13 @@ msgid "MP3 Info" msgstr "Amakuru MP3" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "Amakuru MP3" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "" diff --git a/translations/desktop_files/tdefile-desktops/se.po b/translations/desktop_files/tdefile-desktops/se.po index 74b01d48..9fc4a582 100644 --- a/translations/desktop_files/tdefile-desktops/se.po +++ b/translations/desktop_files/tdefile-desktops/se.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -43,6 +43,13 @@ msgid "MP3 Info" msgstr "MP3-dieđut" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3-dieđut" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "" diff --git a/translations/desktop_files/tdefile-desktops/sk.po b/translations/desktop_files/tdefile-desktops/sk.po index e299c171..90e7c2a0 100644 --- a/translations/desktop_files/tdefile-desktops/sk.po +++ b/translations/desktop_files/tdefile-desktops/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -43,6 +43,12 @@ msgid "MP3 Info" msgstr "AU info" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +msgid "MP4 Info" +msgstr "AU info" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "" diff --git a/translations/desktop_files/tdefile-desktops/sl.po b/translations/desktop_files/tdefile-desktops/sl.po index e80ee9b6..c0376e39 100644 --- a/translations/desktop_files/tdefile-desktops/sl.po +++ b/translations/desktop_files/tdefile-desktops/sl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "Podatki o MP3" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "Podatki o MP3" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Podatki o Musepack" diff --git a/translations/desktop_files/tdefile-desktops/sr.po b/translations/desktop_files/tdefile-desktops/sr.po index 288fb6db..046f7bc6 100644 --- a/translations/desktop_files/tdefile-desktops/sr.po +++ b/translations/desktop_files/tdefile-desktops/sr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "Информације о MP3-ју" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "Информације о MP3-ју" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Информације о Musepack-у" diff --git a/translations/desktop_files/tdefile-desktops/sr@Latn.po b/translations/desktop_files/tdefile-desktops/sr@Latn.po index 59624ded..c2331228 100644 --- a/translations/desktop_files/tdefile-desktops/sr@Latn.po +++ b/translations/desktop_files/tdefile-desktops/sr@Latn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "Informacije o MP3-ju" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "Informacije o MP3-ju" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Informacije o Musepack-u" diff --git a/translations/desktop_files/tdefile-desktops/sv.po b/translations/desktop_files/tdefile-desktops/sv.po index 720a7729..ff4c27b7 100644 --- a/translations/desktop_files/tdefile-desktops/sv.po +++ b/translations/desktop_files/tdefile-desktops/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3-information" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3-information" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Musepack-information" diff --git a/translations/desktop_files/tdefile-desktops/ta.po b/translations/desktop_files/tdefile-desktops/ta.po index 488423ca..6801c6bd 100644 --- a/translations/desktop_files/tdefile-desktops/ta.po +++ b/translations/desktop_files/tdefile-desktops/ta.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3 தகவல்" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3 தகவல்" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "MP3 தகவல்" diff --git a/translations/desktop_files/tdefile-desktops/tdefile-desktops.pot b/translations/desktop_files/tdefile-desktops/tdefile-desktops.pot index 4b1894f5..dc7c71e2 100644 --- a/translations/desktop_files/tdefile-desktops/tdefile-desktops.pot +++ b/translations/desktop_files/tdefile-desktops/tdefile-desktops.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,11 @@ msgid "MP3 Info" msgstr "" #. Name +#: mp4/tdefile_mp4.desktop:3 +msgid "MP4 Info" +msgstr "" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "" diff --git a/translations/desktop_files/tdefile-desktops/tg.po b/translations/desktop_files/tdefile-desktops/tg.po index 92e09024..6f8208ad 100644 --- a/translations/desktop_files/tdefile-desktops/tg.po +++ b/translations/desktop_files/tdefile-desktops/tg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3 Ахборот" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3 Ахборот" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "" diff --git a/translations/desktop_files/tdefile-desktops/th.po b/translations/desktop_files/tdefile-desktops/th.po index ca0bae16..8bcadd76 100644 --- a/translations/desktop_files/tdefile-desktops/th.po +++ b/translations/desktop_files/tdefile-desktops/th.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "ข้อมูล MP3" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "ข้อมูล MP3" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "ข้อมูล Musepack" diff --git a/translations/desktop_files/tdefile-desktops/tr.po b/translations/desktop_files/tdefile-desktops/tr.po index 3ba9a45a..934fc7ef 100644 --- a/translations/desktop_files/tdefile-desktops/tr.po +++ b/translations/desktop_files/tdefile-desktops/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3 Bilgisi" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3 Bilgisi" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "MusePack Bilgisi" diff --git a/translations/desktop_files/tdefile-desktops/uk.po b/translations/desktop_files/tdefile-desktops/uk.po index e6749aa5..badbcf64 100644 --- a/translations/desktop_files/tdefile-desktops/uk.po +++ b/translations/desktop_files/tdefile-desktops/uk.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Roman Savochenko <roman@oscada.org>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" +"PO-Revision-Date: 2025-04-22 18:53+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdemultimedia/tdefile-desktop-files/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: au/tdefile_au.desktop:3 @@ -42,6 +44,11 @@ msgid "MP3 Info" msgstr "Інформація по MP3" #. Name +#: mp4/tdefile_mp4.desktop:3 +msgid "MP4 Info" +msgstr "Інформація MP4" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Інформація по Musepack" diff --git a/translations/desktop_files/tdefile-desktops/uz.po b/translations/desktop_files/tdefile-desktops/uz.po index 4001e52a..a5d54846 100644 --- a/translations/desktop_files/tdefile-desktops/uz.po +++ b/translations/desktop_files/tdefile-desktops/uz.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3 haqida maʼlumot" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3 haqida maʼlumot" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "" diff --git a/translations/desktop_files/tdefile-desktops/uz@cyrillic.po b/translations/desktop_files/tdefile-desktops/uz@cyrillic.po index 472910a1..d28d09f7 100644 --- a/translations/desktop_files/tdefile-desktops/uz@cyrillic.po +++ b/translations/desktop_files/tdefile-desktops/uz@cyrillic.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3 ҳақида маълумот" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3 ҳақида маълумот" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "" diff --git a/translations/desktop_files/tdefile-desktops/ven.po b/translations/desktop_files/tdefile-desktops/ven.po index 3b4839eb..cbbaf72e 100644 --- a/translations/desktop_files/tdefile-desktops/ven.po +++ b/translations/desktop_files/tdefile-desktops/ven.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,11 @@ msgid "MP3 Info" msgstr "" #. Name +#: mp4/tdefile_mp4.desktop:3 +msgid "MP4 Info" +msgstr "" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "" diff --git a/translations/desktop_files/tdefile-desktops/wa.po b/translations/desktop_files/tdefile-desktops/wa.po index 143481a7..f1b9aa05 100644 --- a/translations/desktop_files/tdefile-desktops/wa.po +++ b/translations/desktop_files/tdefile-desktops/wa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -44,6 +44,13 @@ msgid "MP3 Info" msgstr "Infôrmåcion MP3" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "Infôrmåcion MP3" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "" diff --git a/translations/desktop_files/tdefile-desktops/xh.po b/translations/desktop_files/tdefile-desktops/xh.po index 436c3342..410c43df 100644 --- a/translations/desktop_files/tdefile-desktops/xh.po +++ b/translations/desktop_files/tdefile-desktops/xh.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -43,6 +43,13 @@ msgid "MP3 Info" msgstr "MP3 ulwazi" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3 ulwazi" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "" diff --git a/translations/desktop_files/tdefile-desktops/zh_CN.po b/translations/desktop_files/tdefile-desktops/zh_CN.po index 479aab5f..52df6878 100644 --- a/translations/desktop_files/tdefile-desktops/zh_CN.po +++ b/translations/desktop_files/tdefile-desktops/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3 信息" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3 信息" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Musepack 信息" diff --git a/translations/desktop_files/tdefile-desktops/zh_HK.po b/translations/desktop_files/tdefile-desktops/zh_HK.po index c3246023..993c3eb1 100644 --- a/translations/desktop_files/tdefile-desktops/zh_HK.po +++ b/translations/desktop_files/tdefile-desktops/zh_HK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3 資訊" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3 資訊" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Musepack 資訊" diff --git a/translations/desktop_files/tdefile-desktops/zh_TW.po b/translations/desktop_files/tdefile-desktops/zh_TW.po index bc8d75be..5274715a 100644 --- a/translations/desktop_files/tdefile-desktops/zh_TW.po +++ b/translations/desktop_files/tdefile-desktops/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,6 +42,13 @@ msgid "MP3 Info" msgstr "MP3 資訊" #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "MP3 資訊" + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "Musepack 資訊" diff --git a/translations/desktop_files/tdefile-desktops/zu.po b/translations/desktop_files/tdefile-desktops/zu.po index 839a669c..a7b0b8f8 100644 --- a/translations/desktop_files/tdefile-desktops/zu.po +++ b/translations/desktop_files/tdefile-desktops/zu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-29 15:02+0200\n" +"POT-Creation-Date: 2025-03-29 18:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -43,6 +43,13 @@ msgid "MP3 Info" msgstr "Ulwazi lwe-MP3 " #. Name +#: mp4/tdefile_mp4.desktop:3 +#, fuzzy +#| msgid "MP3 Info" +msgid "MP4 Info" +msgstr "Ulwazi lwe-MP3 " + +#. Name #: mpc/tdefile_mpc.desktop:3 msgid "Musepack Info" msgstr "" diff --git a/translations/desktop_files/tdeio_audiocd-desktops/es_AR.po b/translations/desktop_files/tdeio_audiocd-desktops/es_AR.po new file mode 100644 index 00000000..5f351639 --- /dev/null +++ b/translations/desktop_files/tdeio_audiocd-desktops/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-30 00:55+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kcmaudiocd/audiocd.desktop:10 +msgid "Audio CDs" +msgstr "" + +#. Comment +#: kcmaudiocd/audiocd.desktop:11 +msgid "Audiocd IO Slave Configuration" +msgstr "" + +#. Keywords +#: kcmaudiocd/audiocd.desktop:12 +msgid "Audio CD;CD;Ogg;Vorbis;Encoding;CDDA;Bitrate;" +msgstr "" diff --git a/translations/desktop_files/tdemid-desktops/es_AR.po b/translations/desktop_files/tdemid-desktops/es_AR.po new file mode 100644 index 00000000..3e1531c8 --- /dev/null +++ b/translations/desktop_files/tdemid-desktops/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-29 15:16+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: tdemid.desktop:3 +msgid "TDEMid" +msgstr "" + +#. GenericName +#: tdemid.desktop:5 +msgid "MIDI/Karaoke Player" +msgstr "" + +#. Comment +#: x-karaoke.desktop:6 +msgid "Karaoke File" +msgstr "" diff --git a/translations/desktop_files/videothumbnail.desktop/es_AR.po b/translations/desktop_files/videothumbnail.desktop/es_AR.po new file mode 100644 index 00000000..12d856da --- /dev/null +++ b/translations/desktop_files/videothumbnail.desktop/es_AR.po @@ -0,0 +1,20 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-29 15:20+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: videothumbnail.desktop:3 +msgid "Video Files" +msgstr "" diff --git a/xine_artsplugin/CMakeLists.txt b/xine_artsplugin/CMakeLists.txt index 0b647c96..4b69798f 100644 --- a/xine_artsplugin/CMakeLists.txt +++ b/xine_artsplugin/CMakeLists.txt @@ -39,7 +39,7 @@ tde_add_library( arts_xine SHARED AUTOMOC VERSION 0.0.0 LINK mcop kmedia2_idl soundserver_idl artsflow artsflow_idl - ${ARTS_LIBRARIES} ${XINE_LIBRARIES} ${XEXT_LIBRARIES} X11 pthread + ${ARTS_LIBRARIES} ${XINE_LIBRARIES} ${XEXT_LIBRARIES} X11 ${CMAKE_THREAD_LIBS_INIT} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/xine_artsplugin/audio_fifo_out.c b/xine_artsplugin/audio_fifo_out.c index 9255ba2c..bc64277f 100644 --- a/xine_artsplugin/audio_fifo_out.c +++ b/xine_artsplugin/audio_fifo_out.c @@ -22,7 +22,7 @@ #include <sys/time.h> #include <xine/audio_out.h> -#if (XINE_MAJOR_VERSION >= 1) && (XINE_MINOR_VERSION >= 2) +#if (XINE_MAJOR_VERSION > 1) || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2) #include <xine/xine_internal.h> #include <xine/xine_plugin.h> #endif @@ -52,7 +52,7 @@ typedef struct fifo_driver_s { int fifo_flush; int fifo_delay; -#if (XINE_MAJOR_VERSION >= 1) && (XINE_MINOR_VERSION >= 2) +#if (XINE_MAJOR_VERSION > 1) || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2) config_values_t *config; xine_t *xine; #endif @@ -292,7 +292,7 @@ static int ao_fifo_control( ao_driver_t *this_gen, int cmd, ... ) return 0; } -#if (XINE_MAJOR_VERSION >= 1) && (XINE_MINOR_VERSION >= 2) +#if (XINE_MAJOR_VERSION > 1) || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2) static fifo_driver_t * _ao_driver = NULL; typedef struct fifo_class_s { @@ -354,9 +354,18 @@ static ao_driver_t * _arts_open(audio_driver_class_t *driver_class, const void * return &_ao_driver->ao_driver; } +#if (XINE_MAJOR_VERSION > 1) || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION > 2) || \ + (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION == 2 && XINE_SUB_VERSION >= 10) + +static void *_arts_plugin_class_init(xine_t *xine, const void *data) { + +#else + static void *_arts_plugin_class_init(xine_t *xine, void *data) { + +#endif fifo_class_t *cl; - + cl = (fifo_class_t *) malloc(sizeof(fifo_class_t)); if (!cl) return NULL; cl->driver_class.open_plugin = _arts_open; @@ -365,7 +374,7 @@ static void *_arts_plugin_class_init(xine_t *xine, void *data) { cl->driver_class.dispose = _arts_class_dispose; cl->config = xine->config; cl->xine = xine; - + return cl; } @@ -376,7 +385,7 @@ static ao_info_t _arts_info = plugin_info_t arts_xine_plugin_info[] = { - { PLUGIN_AUDIO_OUT, AUDIO_OUT_IFACE_VERSION, "arts", XINE_VERSION_CODE, &_arts_info, _arts_plugin_class_init }, + { PLUGIN_AUDIO_OUT, AUDIO_OUT_IFACE_VERSION, "arts", XINE_VERSION_CODE, &_arts_info, &_arts_plugin_class_init }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; #endif @@ -388,7 +397,7 @@ xine_audio_port_t *init_audio_out_plugin( xine_t *xine, xine_arts_audio *audio, xine->verbosity = 1; #endif -#if (XINE_MAJOR_VERSION >= 1) && (XINE_MINOR_VERSION >= 2) +#if (XINE_MAJOR_VERSION > 1) || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2) xine_audio_port_t *ret; xine_register_plugins(xine, arts_xine_plugin_info); ret = xine_open_audio_driver( xine, "arts", audio ); diff --git a/xine_artsplugin/tools/thumbnail/CMakeLists.txt b/xine_artsplugin/tools/thumbnail/CMakeLists.txt index 4dbc9502..ac77313e 100644 --- a/xine_artsplugin/tools/thumbnail/CMakeLists.txt +++ b/xine_artsplugin/tools/thumbnail/CMakeLists.txt @@ -31,7 +31,7 @@ tde_add_kpart( videothumbnail AUTOMOC SOURCES videocreator.cpp videoscaler.cpp LINK - tdecore-shared ${XINE_LIBRARIES} pthread + tdecore-shared ${XINE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/xine_artsplugin/tools/thumbnail/videocreator.cpp b/xine_artsplugin/tools/thumbnail/videocreator.cpp index a96d574a..9a545ede 100644 --- a/xine_artsplugin/tools/thumbnail/videocreator.cpp +++ b/xine_artsplugin/tools/thumbnail/videocreator.cpp @@ -35,7 +35,7 @@ #include <iostream> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #define XINE_ENABLE_EXPERIMENTAL_FEATURES 1 |
