Translated using Weblate (Polish)

Currently translated at 81.6% (1896 of 2322 strings)

Translation: applications/rosegarden
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/rosegarden/pl/

CMakeL10n.txt

@@ -0,0 +1,66 @@
+#################################################
+#
+#  (C) 2019 Slávek Banko
+#  slavek.banko (AT) axis.cz
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
+
+
+##### include our cmake modules #################
+
+include( TDEL10n )
+
+
+##### prepare strings from data files ###########
+
+## style names
+file( GLOB_RECURSE _style_files
+      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+      ${CMAKE_CURRENT_SOURCE_DIR}/data/styles/*.xml )
+unset( _styles_l10n )
+foreach( _style_file ${_style_files} )
+    get_filename_component( _style_name "${_style_file}" NAME_WE )
+    string( REPLACE "_" " " _style_name "${_style_name}" )
+    set( _styles_l10n "${_styles_l10n}i18n(\"${_style_name}\");\n" )
+endforeach( )
+file( WRITE "${CMAKE_CURRENT_SOURCE_DIR}/data/styles/.tde_l10n" "${_styles_l10n}" )
+
+## font attributes
+set( _fonts_attribs "data/fonts/mappings/*.xml" )
+foreach( _fonts_attrib
+    "rosegarden-font-encoding,name"
+    "font-information,origin"
+    "font-information,copyright"
+    "font-information,mapped-by"
+    "font-information,type" )
+
+    set( _fonts_attribs "${_fonts_attribs}:${_fonts_attrib}" )
+endforeach( )
+
+
+##### create translation templates ##############
+
+tde_l10n_create_template(
+    CATALOG "messages/rosegarden"
+    SOURCES
+        "src"
+        "doc/en/tips"
+        "data/styles/.tde_l10n"
+    ATTRIBUTES
+        ${_fonts_attribs}
+)
+
+tde_l10n_create_template(
+    CATALOG "desktop_files/rosegarden-desktops"
+    SOURCES data/desktop/*.desktop
+)

CMakeLists.txt

@@ -1,399 +1,123 @@
-# Rosegarden
-# A MIDI and audio sequencer and musical notation editor.
+#################################################
 #
-# This program is Copyright 2000-2008
-#     Guillaume Laurent   <glaurent@telegraph-road.org>,
-#     Chris Cannam        <cannam@all-day-breakfast.com>,
-#     Richard Bown        <richard.bown@ferventsoftware.com>
+#  (C) 2011 Timothy Pearson
+#  kb9vqf (AT) pearsoncomputing.net
 #
-# The moral rights of Guillaume Laurent, Chris Cannam, and Richard
-# Bown to claim authorship of this work have been asserted.
+#  Improvements and feedback are welcome
 #
-# This file is Copyright 2006-2008
-#     Pedro Lopez-Cabanillas <plcl@users.sourceforge.net>
+#  This file is released under GPL >= 2
 #
-# Other copyrights also apply to some parts of this work.  Please
-# see the AUTHORS file and individual file headers for details.
-#
-# 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; either version 2 of the
-# License, or (at your option) any later version.  See the file
-# COPYING included with this distribution for more information.
+#################################################
+
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
+tde_set_project_version( )
 
-# The name of our project is "ROSEGARDEN". CMakeLists files in this project can
-# refer to the root source directory of the project as ${ROSEGARDEN_SOURCE_DIR} 
-# and to the root binary directory of the project as ${ROSEGARDEN_BINARY_DIR}
-PROJECT(ROSEGARDEN)
 
-# CMake supports KDE checks since this version number
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4.2)
+##### general package setup #####################
 
-# Show full commands and messages. It generates a lot of console output.
-# It is necessary for Eclipse warning/error parser, 
-# but it can be enabled anyway with "make VERBOSE=1"
-SET(CMAKE_VERBOSE_MAKEFILE OFF)
+project( rosegarden )
 
-# Seems that relative paths break some scripts. Don't set it ON
-SET(CMAKE_USE_RELATIVE_PATHS OFF)
 
-# Rebuild the object files if the rules have changed, but not the actual source 
-# files or headers (e.g. if you changed the some compiler switches)
-SET(CMAKE_SKIP_RULE_DEPENDENCY OFF)
+##### include essential cmake modules ###########
 
-# Misc settings
-SET(CMAKE_COLOR_MAKEFILE ON)
-SET(CMAKE_INCLUDE_CURRENT_DIR ON)
-SET(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+include( CheckCXXSourceCompiles )
+include( CheckFunctionExists )
+include( CheckIncludeFileCXX )
+include( CheckLibraryExists )
+include( CheckStructHasMember )
+include( CheckSymbolExists )
+include( CheckTypeSize )
+include( FindPkgConfig )
+include( FindThreads )
 
-# Additional CMake modules for 3rd party library checks reside here
-SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_admin")
+
+##### set up versioning #########################
 
 # Mark as advanced
-MARK_AS_ADVANCED(EXECUTABLE_OUTPUT_PATH 
+mark_as_advanced(EXECUTABLE_OUTPUT_PATH
                  LIBRARY_OUTPUT_PATH
 		 CMAKE_BACKWARDS_COMPATIBILITY)
 
 # Rosegarden version string
-SET (VERSION_MAJOR "1")
-SET (VERSION_MINOR "7")
-SET (VERSION_PATCH "0")
+set (VERSION_MAJOR "1")
+set (VERSION_MINOR "7")
+set (VERSION_PATCH "0")
 # comment out the next line for a public release
-#SET (VERSION_SUFFIX "svn")
-SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
-IF(VERSION_SUFFIX)
-   SET (VERSION "${VERSION}-${VERSION_SUFFIX}")
-ENDIF(VERSION_SUFFIX)
-ADD_DEFINITIONS(-D'VERSION="${VERSION}"')
-
-# User options
-OPTION(WANT_DEBUG   "Include debug support" OFF)
-OPTION(WANT_FULLDBG "Full debug support (BIG executables!)" OFF)
-OPTION(WANT_SOUND   "Include Sound support" ON)
-OPTION(WANT_JACK    "Include Jack (Jack Audio Connection Kit) support" ON)
-OPTION(WANT_DSSI    "Include DSSI support" ON)
-OPTION(WANT_LIRC    "Include LIRC (Linux Infrared Remote Control) support" OFF)
-OPTION(WANT_PCH     "Use precompiled headers" OFF)
-OPTION(WANT_TEST    "Perform unit tests" OFF)
-
-IF(WANT_TEST)
-    ENABLE_TESTING()
-ENDIF(WANT_TEST)
-
-IF(NOT WANT_SOUND)
-    SET(WANT_JACK OFF)
-    SET(WANT_DSSI OFF)
-    ADD_DEFINITIONS(-DNO_SOUND)
-ENDIF(NOT WANT_SOUND)
-
-# Check for KDE3
-FIND_PACKAGE(KDE3 REQUIRED QUIET)
-IF(QT_FOUND)
-    ADD_DEFINITIONS(${QT_DEFINITIONS})
-    MESSAGE(STATUS "Found Qt3 (version ${qt_version_str})")
-    #MESSAGE("QT_LIBRARIES: ${QT_LIBRARIES}")
-ELSE(QT_FOUND)
-    MESSAGE(STATUS_ERROR "Qt3 package not found--assuming TQt4")
-    SET(QT_INCLUDE_DIR "/usr/include/qt4")
-ENDIF(QT_FOUND)
-SET(QT_UIC_EXECUTABLE "/usr/bin/uic-tqt")
-SET(QT_MOC_EXECUTABLE "/usr/bin/tmoc")
-IF(KDE3_FOUND)
-    ADD_DEFINITIONS(${KDE3_DEFINITIONS})
-    #MESSAGE("KDE3PREFIX: ${KDE3PREFIX}")
-    KDE3_PRINT_RESULTS()
-    #MESSAGE("QT_AND_KDECORE_LIBS: ${QT_AND_KDECORE_LIBS}")
-ELSE(KDE3_FOUND)    
-    MESSAGE(FATAL_ERROR "KDE3 Not found")
-ENDIF(KDE3_FOUND)
-
-# Clear the flags set by FindKDE3 
-SET(CMAKE_CXX_FLAGS "-I/usr/include/tqt -include tqt.h -DTQT_THREAD_SUPPORT")
-MARK_AS_ADVANCED(KDE3_BUILD_TESTS
-                 KDE3_ENABLE_FINAL
-		 KDE3_DCOPIDL_EXECUTABLE
-		 KDE3_DCOPIDL2CPP_EXECUTABLE
-		 KDE3_INCLUDE_DIR
-		 KDE3_KCFGC_EXECUTABLE
-		 KDE3_KDECORE_LIBRARY
-		 KDECONFIG_EXECUTABLE )
-
-# Provide the KDE3 prefix as a default prefix (if the user has CMake 2.4.4)
-IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-    SET(CMAKE_INSTALL_PREFIX ${KDE3PREFIX} CACHE PATH
-        "Install path prefix, prepended onto install directories." FORCE)
-ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) 
-
-# Check for PKG-CONFIG
-FIND_PACKAGE(PkgConfig REQUIRED)
-IF(PKG_CONFIG_FOUND)
-    MESSAGE(STATUS "Program pkg-config found (${PKG_CONFIG_EXECUTABLE})")
-ELSE(PKG_CONFIG_FOUND)
-    MESSAGE(FATAL_ERROR "Program pkg-config not found")
-ENDIF(PKG_CONFIG_FOUND)
-
-# Initialize some variables
-SET(HAVE_XFT FALSE)
-SET(HAVE_ALSA FALSE)
-SET(HAVE_JACK FALSE)
-SET(HAVE_DSSI FALSE)
-SET(HAVE_LIBLO FALSE)
-SET(HAVE_LIBLRDF FALSE)
-SET(HAVE_LADSPA FALSE)
-SET(HAVE_LIRC FALSE)
-SET(HAVE_FFTW3F FALSE)
-
-# Check for Xft
-PKG_CHECK_MODULES(XFT xft>=2.1.0)
-IF(XFT_FOUND)
-    ADD_DEFINITIONS(-DHAVE_XFT)
-    SET(HAVE_XFT TRUE)
-    SET(XFT_LIBS ${XFT_LIBRARIES})
-    #MESSAGE("XFT_LIBS: ${XFT_LIBS}")
-    LIST(APPEND XFT_LIB_DIR ${XFT_LIBRARY_DIRS} ${XFT_LIBDIR})
-    #MESSAGE("XFT_LIB_DIR: ${XFT_LIB_DIR}")
-    LIST(APPEND XFT_INC_DIR ${XFT_INCLUDE_DIRS} ${XFT_INCLUDEDIR})
-    #MESSAGE("XFT_INC_DIR: ${XFT_INC_DIR}")    
-ENDIF(XFT_FOUND)
-
-IF(WANT_SOUND)
-
-    # Check for ALSA 1.0
-    PKG_CHECK_MODULES(ALSA REQUIRED alsa>=1.0)
-    IF(ALSA_FOUND)
-        SET(HAVE_ALSA TRUE)
-        ADD_DEFINITIONS(-DHAVE_ALSA)
-        SET(ALSA_LIBS ${ALSA_LIBRARIES})
-        #MESSAGE("ALSA_LIBS: ${ALSA_LIBS}")
-        LIST(APPEND ALSA_LIB_DIR ${ALSA_LIBRARY_DIRS} ${ALSA_LIBDIR} )
-        #MESSAGE("ALSA_LIB_DIR: ${ALSA_LIB_DIR}")
-        LIST(APPEND ALSA_INC_DIR ${ALSA_INCLUDE_DIRS} ${ALSA_INCLUDEDIR})
-        #MESSAGE("ALSA_INC_DIR: ${ALSA_INC_DIR}")
-    ELSE(ALSA_FOUND)
-        MESSAGE(FATAL_ERROR "Please install the required package. Aborting")
-    ENDIF(ALSA_FOUND)
-    
-    IF(WANT_JACK)
-        PKG_CHECK_MODULES(JACK jack>=0.77)
-        IF(JACK_FOUND)
-            ADD_DEFINITIONS(-DHAVE_LIBJACK)
-            SET(HAVE_JACK TRUE)
-            SET(JACK_LIBS ${JACK_LIBRARIES})
-            #MESSAGE("JACK_LIBS: ${JACK_LIBS}")
-            LIST(APPEND JACK_LIB_DIR ${JACK_LIBDIR} ${JACK_LIBRARY_DIRS})
-            #MESSAGE("JACK_LIB_DIR: ${JACK_LIB_DIR}")
-            LIST(APPEND JACK_INC_DIR ${JACK_INCLUDEDIR} ${JACK_INCLUDE_DIRS})
-            #MESSAGE("JACK_INC_DIR: ${JACK_INC_DIR}")
-        ENDIF(JACK_FOUND)
-    ENDIF(WANT_JACK)
-    
-    IF(WANT_DSSI)
-        PKG_CHECK_MODULES(DSSI dssi>=0.4)
-        IF(DSSI_FOUND)
-            ADD_DEFINITIONS(-DHAVE_DSSI)
-            SET(HAVE_DSSI TRUE)
-            LIST(APPEND DSSI_INC_DIR ${DSSI_INCLUDE_DIRS} ${DSSI_INCLUDEDIR})
-            #MESSAGE("DSSI_INC_DIR: ${DSSI_INC_DIR}")
-        ENDIF(DSSI_FOUND)
-    ENDIF(WANT_DSSI)
-    
-    PKG_CHECK_MODULES(LIBLO liblo>=0.7)
-    IF(LIBLO_FOUND)
-        ADD_DEFINITIONS(-DHAVE_LIBLO)
-        SET(HAVE_LIBLO TRUE)
-        SET(LIBLO_LIBS ${LIBLO_LIBRARIES})
-        #MESSAGE("LIBLO_LIBS: ${LIBLO_LIBS}")
-        LIST(APPEND LIBLO_LIB_DIR ${LIBLO_LIBDIR} ${LIBLO_LIBRARY_DIRS})
-        #MESSAGE("LIBLO_LIB_DIR: ${LIBLO_LIB_DIR}")
-        LIST(APPEND LIBLO_INC_DIR ${LIBLO_INCLUDEDIR} ${LIBLO_INCLUDE_DIRS})
-        #MESSAGE("LIBLO_INC_DIR: ${LIBLO_INC_DIR}")
-    ENDIF(LIBLO_FOUND)
-    
-    PKG_CHECK_MODULES(LRDF lrdf>=0.3)
-    IF(LRDF_FOUND)
-        SET(HAVE_LIBLRDF TRUE)
-        ADD_DEFINITIONS(-DHAVE_LIBLRDF)
-        SET(LRDF_LIBS ${LRDF_LIBRARIES})
-        #MESSAGE("LRDF_LIBS: ${LRDF_LIBS}")
-        LIST(APPEND LRDF_LIB_DIR ${LRDF_LIBDIR} ${LRDF_LIBRARY_DIRS})
-        #MESSAGE("LRDF_LIB_DIR: ${LRDF_LIB_DIR}")
-        LIST(APPEND LRDF_INC_DIR ${LRDF_INCLUDEDIR} ${LRDF_INCLUDE_DIRS})
-        #MESSAGE("LRDF_INC_DIR: ${LRDF_INC_DIR}")
-    ENDIF(LRDF_FOUND)
-
-    FIND_PACKAGE(LADSPA QUIET)
-    IF(LADSPA_FOUND)
-        SET(HAVE_LADSPA TRUE)
-        ADD_DEFINITIONS(-DHAVE_LADSPA)
-        SET(LADSPA_INC_DIR ${LADSPA_INCLUDE_DIR})
-        MESSAGE(STATUS "Found LADSPA (${LADSPA_INC_DIR})")
-    ENDIF(LADSPA_FOUND)
-    
-ENDIF(WANT_SOUND)
-
-PKG_CHECK_MODULES(FFTW3F REQUIRED fftw3f>=3.0.0)
-IF(FFTW3F_FOUND)
-    ADD_DEFINITIONS(-DHAVE_FFTW3F)
-    SET(HAVE_FFTW3F TRUE)
-    SET(FFTW3F_LIBS ${FFTW3F_LIBRARIES})
-    #MESSAGE("FFTW3F_LIBS: ${FFTW3F_LIBS}")
-    LIST(APPEND FFTW3F_LIB_DIR ${FFTW3F_LIBDIR} ${FFTW3F_LIBRARY_DIRS})
-    #MESSAGE("FFTW3F_LIB_DIR: ${FFTW3F_LIB_DIR}")
-    LIST(APPEND FFTW3F_INC_DIR ${FFTW3F_INCLUDEDIR} ${FFTW3F_INCLUDE_DIRS})
-    #MESSAGE("FFTW3F_INC_DIR: ${FFTW3F_INC_DIR}")
-ELSE(FFTW3F_FOUND)
-    MESSAGE(FATAL_ERROR "Please install the required package. Aborting")
-ENDIF(FFTW3F_FOUND)
-
-IF(WANT_LIRC)
-    FIND_PACKAGE(LIRC QUIET)
-    IF(LIRC_FOUND)
-        SET(HAVE_LIRC TRUE)
-        ADD_DEFINITIONS(-DHAVE_LIRC)
-        MESSAGE(STATUS "Found LIRC (${LIRC_LIBRARY})")
-        SET(LIRC_LIBS ${LIRC_LIBRARY})
-        SET(LIRC_INC_DIR ${LIRC_INCLUDE_DIR})
-        SET(LIRC_LIB_DIR ${LIRC_LIBRARY_DIR})
-        #MESSAGE("LIRC_LIBS: ${LIRC_LIBS}")
-        #MESSAGE("LIRC_LIB_DIR: ${LIRC_LIB_DIR}")
-        #MESSAGE("LIRC_INC_DIR: ${LIRC_INC_DIR}")    
-    ENDIF(LIRC_FOUND)
-ENDIF(WANT_LIRC)
-
-FIND_PACKAGE(MSGFMT REQUIRED)
-IF(MSGFMT_FOUND)
-    MESSAGE(STATUS "Program msgfmt found (${MSGFMT_EXECUTABLE})")
-ENDIF(MSGFMT_FOUND)
-
-FIND_PACKAGE(KDECONFIG)
-IF(KDECONFIG_EXECUTABLE)
-    MESSAGE(STATUS "Program kde-config found (${KDECONFIG_EXECUTABLE})")
-    #MESSAGE("KDE3PREFIX: ${KDE3PREFIX}")
-ENDIF(KDECONFIG_EXECUTABLE)
-
-FIND_PACKAGE(MEINPROC REQUIRED)
-IF(MEINPROC_FOUND)
-    MESSAGE(STATUS "Program meinproc found (${MEINPROC_EXECUTABLE})")
-ENDIF(MEINPROC_FOUND)
-
-# Check GCC for PCH support
-SET(USE_PCH FALSE)
-IF(WANT_PCH)
-    FIND_PACKAGE(PCHSupport)
-    IF(PCHSupport_FOUND)
-        SET(USE_PCH TRUE)
-        ADD_DEFINITIONS(-DUSE_PCH)
-        MESSAGE(STATUS "Enabling precompiled headers for GCC ${gcc_compiler_version}") 
-    ENDIF(PCHSupport_FOUND)
-ENDIF(WANT_PCH)
-
-# Check PTHREAD_MUTEX_RECURSIVE
-INCLUDE(CheckCSourceCompiles)
-CHECK_C_SOURCE_COMPILES(
-    "#include <pthread.h>
-     int main(int argc, char **argv) {
-         pthread_mutexattr_t attr;
-         pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-         return 0;
-     }" PTHREAD_HAS_MUTEX_RECURSIVE)
-IF(PTHREAD_HAS_MUTEX_RECURSIVE)
-    ADD_DEFINITIONS(-DHAVE_PTHREAD_MUTEX_RECURSIVE)
-ENDIF(PTHREAD_HAS_MUTEX_RECURSIVE)
-# End of PTHREAD_MUTEX_RECURSIVE Test
-
-SET(CMAKE_CXX_FLAGS_RELEASE         "-O2 -w -fexceptions -DNDEBUG -include tqt.h")
-SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO  "-O2 -g -Wall -fexceptions -DDEBUG -include tqt.h")
-SET(CMAKE_CXX_FLAGS_DEBUG           "-O0 -g3 -Wall -fexceptions -DDEBUG -include tqt.h")
-
-MESSAGE(STATUS "Rosegarden ${VERSION} will be built for install into ${CMAKE_INSTALL_PREFIX}")
-
-IF(WANT_DEBUG)
-    IF(WANT_FULLDBG)
-        MESSAGE(STATUS "Configured to compile including full debug information in the executables")
-        SET(CMAKE_BUILD_TYPE Debug CACHE STRING
-            "Choose the type of build, options are: Debug Release RelWithDebInfo" FORCE)
-    ELSE(WANT_FULLDBG)
-        MESSAGE(STATUS "Configured to compile including debug information in the executables")
-        SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
-            "Choose the type of build, options are: Debug Release RelWithDebInfo" FORCE)
-    ENDIF(WANT_FULLDBG)
-ELSE(WANT_DEBUG)
-    MESSAGE(STATUS "Configured to compile for release without debug information")
-    SET(CMAKE_BUILD_TYPE Release CACHE STRING
-        "Choose the type of build, options are: Debug Release RelWithDebInfo" FORCE)
-ENDIF(WANT_DEBUG)
-MARK_AS_ADVANCED(CMAKE_BUILD_TYPE)
-
-# Warn the user if important libraries are missing
-INCLUDE(UserWarnings)
-
-# Recurse into the "src" subdirectory. This does not actually
-# cause another cmake executable to run. The same process will walk through
-# the project's entire directory structure.
-# Output directory will be "RGbuild/"
-ADD_SUBDIRECTORY(src RGbuild)
-
-# Build and install the translations directory
-ADD_SUBDIRECTORY(po RGbuild/po)
-
-# Build and install the documentation directory
-ADD_SUBDIRECTORY(docs RGbuild/docs)
-
-# Install data files
-ADD_SUBDIRECTORY(data RGbuild/data)
-
-# install some documents...
-# INSTALL( FILES AUTHORS COPYING README TRANSLATORS INSTALL rosegarden.lsm
-#         DESTINATION share/doc/rosegarden-${VERSION} )
+#set (VERSION_SUFFIX "svn")
+set (PACKAGE_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
+if(VERSION_SUFFIX)
+	set (PACKAGE_VERSION "${PACKAGE_VERSION}-${VERSION_SUFFIX}")
+endif(VERSION_SUFFIX)
+add_definitions(-D'VERSION="${PACKAGE_VERSION}"')
 
-# create and install the version file
-FILE(WRITE version.txt "${VERSION}\n")
-INSTALL( FILES version.txt
-         DESTINATION ${KDE3DATADIR}/rosegarden )
-
-# uninstall custom target
-CONFIGURE_FILE(
-    "${CMAKE_SOURCE_DIR}/cmake_admin/cmake_uninstall.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-    IMMEDIATE @ONLY)
-
-ADD_CUSTOM_TARGET(uninstall
-    "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
-
-# Custom target trying to clean the CMake generated files
-ADD_CUSTOM_TARGET ( distclean
-    COMMAND rm -f  {,src/,po/,docs/,data/}CMakeCache.txt
-    COMMAND rm -f  {,src/,po/,docs/,data/}cmake_install.cmake
-    COMMAND rm -f  {,src/,po/,docs/,data/}cmake_uninstall.cmake
-    COMMAND rm -f  {,src/,po/,docs/,data/}CPackConfig.cmake
-    COMMAND rm -f  {,src/,po/,docs/,data/}CPackSourceConfig.cmake
-    COMMAND rm -f  {,src/,po/,docs/,data/}install_manifest.txt
-    COMMAND rm -f  {,src/,po/,docs/,data/}progress.make
-    COMMAND rm -f  {,src/,po/,docs/,data/}rosegarden.spec
-    COMMAND rm -f  {,src/,po/,docs/,data/}Makefile
-    COMMAND rm -rf {,src/,po/,docs/,data/}CMakeFiles
-    COMMAND rm -rf {,src/,po/,docs/,data/}_CPack_Packages
-    COMMAND rm -rf RGbuild/*
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-)
-ADD_DEPENDENCIES(distclean clean)
-
-# configure the RPM spec
-CONFIGURE_FILE(
-    "${CMAKE_SOURCE_DIR}/rosegarden.spec.in"
-    "${CMAKE_SOURCE_DIR}/rosegarden.spec"
-    IMMEDIATE @ONLY)
-
-# tarball target
-ADD_CUSTOM_TARGET ( tarball
-    COMMAND mkdir -p rosegarden-${VERSION}
-    COMMAND cp -r cmake_admin rosegarden-${VERSION}
-    COMMAND cp -r data rosegarden-${VERSION}
-    COMMAND cp -r docs rosegarden-${VERSION}
-    COMMAND cp -r po rosegarden-${VERSION}
-    COMMAND cp -r src rosegarden-${VERSION}
-    COMMAND cp CMakeLists.txt AUTHORS COPYING Doxyfile INSTALL README rosegarden.* TRANSLATORS rosegarden-${VERSION}
-    COMMAND tar -cj --exclude .svn --exclude gettext-0.10.35-kde -f rosegarden-${VERSION}.tar.bz2 rosegarden-${VERSION}
-    COMMAND rm -rf rosegarden-${VERSION}
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+
+##### include our cmake modules #################
+
+include( TDEMacros )
+
+
+##### setup install paths #######################
+
+include( TDESetupPaths )
+tde_setup_paths( )
+
+
+##### user requested modules ####################
+
+option( BUILD_ALL "Build all" OFF )
+option( BUILD_DOC "Build doc" ${BUILD_ALL} )
+option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
+option( WANT_DEBUG   "Include debug support" OFF )
+option( WANT_FULLDBG "Full debug support (BIG executables!)" OFF )
+option( WANT_SOUND   "Include Sound support" ${BUILD_ALL} )
+option( WANT_JACK    "Include Jack (Jack Audio Connection Kit) support" ${BUILD_ALL} )
+option( WANT_DSSI    "Include DSSI support" ${BUILD_ALL} )
+option( WANT_LIRC    "Include LIRC (Linux Infrared Remote Control) support" OFF )
+option( WANT_PCH     "Use precompiled headers" OFF )
+option( WANT_TEST    "Perform unit tests" OFF )
+
+if(WANT_TEST)
+    enable_testing()
+endif(WANT_TEST)
+
+if(NOT WANT_SOUND)
+    set(WANT_JACK OFF)
+    set(WANT_DSSI OFF)
+    add_definitions(-DNO_SOUND)
+endif(NOT WANT_SOUND)
+
+##### configure checks ##########################
+
+include( ConfigureChecks.cmake )
+
+
+###### global compiler settings #################
+
+add_definitions(
+  -DHAVE_CONFIG_H
 )
+
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
+set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
+set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
+
+
+##### source directories ########################
+
+add_subdirectory( src )
+add_subdirectory( data )
+tde_conditional_add_project_docs( BUILD_DOC )
+tde_conditional_add_project_translations( BUILD_TRANSLATIONS )
+
+
+##### write configure files #####################
+
+configure_file( config.h.cmake config.h @ONLY )
+
+# create and install the version file
+file(WRITE "${CMAKE_BINARY_DIR}/version.txt" "${PACKAGE_VERSION}\n")
+install( FILES "${CMAKE_BINARY_DIR}/version.txt" DESTINATION ${DATA_INSTALL_DIR}/rosegarden )

ConfigureChecks.cmake

@@ -0,0 +1,244 @@
+#################################################
+#
+#  (C) 2011 Timothy Pearson
+#  kb9vqf (AT) pearsoncomputing.net
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+
+# required stuff
+find_package( TQt )
+find_package( TDE )
+
+tde_setup_architecture_flags( )
+
+include(TestBigEndian)
+test_big_endian(WORDS_BIGENDIAN)
+
+tde_setup_largefiles( )
+
+
+##### check for gcc visibility support #########
+
+if( WITH_GCC_VISIBILITY )
+  tde_setup_gcc_visibility( )
+endif( )
+
+
+# Initialize some variables
+set(HAVE_XFT FALSE)
+set(HAVE_ALSA FALSE)
+set(HAVE_JACK FALSE)
+set(HAVE_DSSI FALSE)
+set(HAVE_LIBLO FALSE)
+set(HAVE_LIBLRDF FALSE)
+set(HAVE_LADSPA FALSE)
+set(HAVE_LIRC FALSE)
+set(HAVE_FFTW3F FALSE)
+
+# Check for Xft
+pkg_check_modules(XFT xft>=2.1.0)
+if(XFT_FOUND)
+    add_definitions(-DHAVE_XFT)
+    set(HAVE_XFT TRUE)
+    set(XFT_LIBS ${XFT_LIBRARIES})
+    #message("XFT_LIBS: ${XFT_LIBS}")
+    list(APPEND XFT_LIB_DIR ${XFT_LIBRARY_DIRS} ${XFT_LIBDIR})
+    #message("XFT_LIB_DIR: ${XFT_LIB_DIR}")
+    list(APPEND XFT_INC_DIR ${XFT_INCLUDE_DIRS} ${XFT_INCLUDEDIR})
+    #message("XFT_INC_DIR: ${XFT_INC_DIR}")
+endif(XFT_FOUND)
+
+if(WANT_SOUND)
+
+    # Check for ALSA 1.0
+    pkg_check_modules(ALSA REQUIRED alsa>=1.0)
+    if(ALSA_FOUND)
+        set(HAVE_ALSA TRUE)
+        add_definitions(-DHAVE_ALSA)
+        set(ALSA_LIBS ${ALSA_LIBRARIES})
+        #message("ALSA_LIBS: ${ALSA_LIBS}")
+        list(APPEND ALSA_LIB_DIR ${ALSA_LIBRARY_DIRS} ${ALSA_LIBDIR} )
+        #message("ALSA_LIB_DIR: ${ALSA_LIB_DIR}")
+        list(APPEND ALSA_INC_DIR ${ALSA_INCLUDE_DIRS} ${ALSA_INCLUDEDIR})
+        #message("ALSA_INC_DIR: ${ALSA_INC_DIR}")
+    else(ALSA_FOUND)
+        message(FATAL_ERROR "Please install the required package. Aborting")
+    endif(ALSA_FOUND)
+
+    if(WANT_JACK)
+        pkg_check_modules(JACK jack>=0.77)
+        if(JACK_FOUND)
+            add_definitions(-DHAVE_LIBJACK)
+            set(HAVE_JACK TRUE)
+            set(JACK_LIBS ${JACK_LIBRARIES})
+            #message("JACK_LIBS: ${JACK_LIBS}")
+            list(APPEND JACK_LIB_DIR ${JACK_LIBDIR} ${JACK_LIBRARY_DIRS})
+            #message("JACK_LIB_DIR: ${JACK_LIB_DIR}")
+            list(APPEND JACK_INC_DIR ${JACK_INCLUDEDIR} ${JACK_INCLUDE_DIRS})
+            #message("JACK_INC_DIR: ${JACK_INC_DIR}")
+        endif(JACK_FOUND)
+    endif(WANT_JACK)
+
+    if(WANT_DSSI)
+        pkg_check_modules(DSSI dssi>=0.4)
+        if(DSSI_FOUND)
+            add_definitions(-DHAVE_DSSI)
+            set(HAVE_DSSI TRUE)
+            list(APPEND DSSI_INC_DIR ${DSSI_INCLUDE_DIRS} ${DSSI_INCLUDEDIR})
+            #message("DSSI_INC_DIR: ${DSSI_INC_DIR}")
+        endif(DSSI_FOUND)
+    endif(WANT_DSSI)
+
+    pkg_check_modules(LIBLO liblo>=0.7)
+    if(LIBLO_FOUND)
+        add_definitions(-DHAVE_LIBLO)
+        set(HAVE_LIBLO TRUE)
+        set(LIBLO_LIBS ${LIBLO_LIBRARIES})
+        #message("LIBLO_LIBS: ${LIBLO_LIBS}")
+        list(APPEND LIBLO_LIB_DIR ${LIBLO_LIBDIR} ${LIBLO_LIBRARY_DIRS})
+        #message("LIBLO_LIB_DIR: ${LIBLO_LIB_DIR}")
+        list(APPEND LIBLO_INC_DIR ${LIBLO_INCLUDEDIR} ${LIBLO_INCLUDE_DIRS})
+        #message("LIBLO_INC_DIR: ${LIBLO_INC_DIR}")
+    endif(LIBLO_FOUND)
+
+    pkg_check_modules(LRDF lrdf>=0.3)
+    if(LRDF_FOUND)
+        set(HAVE_LIBLRDF TRUE)
+        add_definitions(-DHAVE_LIBLRDF)
+        set(LRDF_LIBS ${LRDF_LIBRARIES})
+        #message("LRDF_LIBS: ${LRDF_LIBS}")
+        list(APPEND LRDF_LIB_DIR ${LRDF_LIBDIR} ${LRDF_LIBRARY_DIRS})
+        #message("LRDF_LIB_DIR: ${LRDF_LIB_DIR}")
+        list(APPEND LRDF_INC_DIR ${LRDF_INCLUDEDIR} ${LRDF_INCLUDE_DIRS})
+        #message("LRDF_INC_DIR: ${LRDF_INC_DIR}")
+    endif(LRDF_FOUND)
+
+    ##################################################################
+    # - Try to find LADSPA header
+    # Once done this will define:
+    #
+    #  LADSPA_FOUND - system has LADSPA
+    #  LADSPA_INCLUDE_DIR - LADSPA header path
+    if(LADSPA_INCLUDE_DIR)
+       set(LADSPA_FIND_QUIETLY TRUE)
+    endif(LADSPA_INCLUDE_DIR)
+    find_path(LADSPA_INCLUDE_DIR "ladspa.h"
+       /usr/include
+       /usr/local/include
+    )
+    if(LADSPA_INCLUDE_DIR)
+       set(LADSPA_FOUND TRUE)
+    else(LADSPA_INCLUDE_DIR)
+       set(LADSPA_FOUND FALSE)
+       set(LADSPA_INCLUDE_DIR "")
+    endif(LADSPA_INCLUDE_DIR)
+    if(LADSPA_FOUND)
+        if(NOT LADSPA_FIND_QUIETLY)
+            message(STATUS "Found LADSPA: ${LADSPA_INCLUDE_DIR}")
+        endif(NOT LADSPA_FIND_QUIETLY)
+    else(LADSPA_FOUND)
+        if(LADSPA_FIND_REQUIRED)
+            message(FATAL_ERROR "Could not find LADSPA")
+        endif(LADSPA_FIND_REQUIRED)
+    endif(LADSPA_FOUND)
+    mark_as_advanced(LADSPA_INCLUDE_DIR)
+    ##################################################################
+
+    if(LADSPA_FOUND)
+        set(HAVE_LADSPA TRUE)
+        add_definitions(-DHAVE_LADSPA)
+        set(LADSPA_INC_DIR ${LADSPA_INCLUDE_DIR})
+    endif(LADSPA_FOUND)
+
+endif(WANT_SOUND)
+
+pkg_check_modules(FFTW3F REQUIRED fftw3f>=3.0.0)
+if(FFTW3F_FOUND)
+    add_definitions(-DHAVE_FFTW3F)
+    set(HAVE_FFTW3F TRUE)
+    set(FFTW3F_LIBS ${FFTW3F_LIBRARIES})
+    #message("FFTW3F_LIBS: ${FFTW3F_LIBS}")
+    list(APPEND FFTW3F_LIB_DIR ${FFTW3F_LIBDIR} ${FFTW3F_LIBRARY_DIRS})
+    #message("FFTW3F_LIB_DIR: ${FFTW3F_LIB_DIR}")
+    list(APPEND FFTW3F_INC_DIR ${FFTW3F_INCLUDEDIR} ${FFTW3F_INCLUDE_DIRS})
+    #message("FFTW3F_INC_DIR: ${FFTW3F_INC_DIR}")
+else(FFTW3F_FOUND)
+    message(FATAL_ERROR "Please install the required package. Aborting")
+endif(FFTW3F_FOUND)
+
+if(WANT_LIRC)
+    find_package(LIRC QUIET)
+    if(LIRC_FOUND)
+        set(HAVE_LIRC TRUE)
+        add_definitions(-DHAVE_LIRC)
+        message(STATUS "Found LIRC (${LIRC_LIBRARY})")
+        set(LIRC_LIBS ${LIRC_LIBRARY})
+        set(LIRC_INC_DIR ${LIRC_INCLUDE_DIR})
+        set(LIRC_LIB_DIR ${LIRC_LIBRARY_DIR})
+        #message("LIRC_LIBS: ${LIRC_LIBS}")
+        #message("LIRC_LIB_DIR: ${LIRC_LIB_DIR}")
+        #message("LIRC_INC_DIR: ${LIRC_INC_DIR}")
+    endif(LIRC_FOUND)
+endif(WANT_LIRC)
+
+# Check GCC for PCH support
+set(USE_PCH FALSE)
+if(WANT_PCH)
+    find_package(PCHSupport)
+    if(PCHSupport_FOUND)
+        set(USE_PCH TRUE)
+        add_definitions(-DUSE_PCH)
+        message(STATUS "Enabling precompiled headers for GCC ${gcc_compiler_version}")
+    endif(PCHSupport_FOUND)
+endif(WANT_PCH)
+
+# Check PTHREAD_MUTEX_RECURSIVE
+include(CheckCSourceCompiles)
+check_c_source_compiles(
+    "#include <pthread.h>
+     int main(int argc, char **argv) {
+         pthread_mutexattr_t attr;
+         pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+         return 0;
+     }" PTHREAD_HAS_MUTEX_RECURSIVE)
+if(PTHREAD_HAS_MUTEX_RECURSIVE)
+    add_definitions(-DHAVE_PTHREAD_MUTEX_RECURSIVE)
+endif(PTHREAD_HAS_MUTEX_RECURSIVE)
+# End of PTHREAD_MUTEX_RECURSIVE Test
+
+set(CMAKE_CXX_FLAGS_RELEASE         "-O2 -w -fexceptions -DNDEBUG")
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO  "-O2 -g -Wall -fexceptions -DDEBUG")
+set(CMAKE_CXX_FLAGS_DEBUG           "-O0 -g3 -Wall -fexceptions -DDEBUG")
+
+message(STATUS "Rosegarden ${PACKAGE_VERSION} will be built for install into ${CMAKE_INSTALL_PREFIX}")
+
+if(WANT_DEBUG)
+    if(WANT_FULLDBG)
+        message(STATUS "Configured to compile including full debug information in the executables")
+        set(CMAKE_BUILD_TYPE Debug CACHE STRING
+            "Choose the type of build, options are: Debug Release RelWithDebInfo" FORCE)
+    else(WANT_FULLDBG)
+        message(STATUS "Configured to compile including debug information in the executables")
+        set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
+            "Choose the type of build, options are: Debug Release RelWithDebInfo" FORCE)
+    endif(WANT_FULLDBG)
+else(WANT_DEBUG)
+    message(STATUS "Configured to compile for release without debug information")
+    set(CMAKE_BUILD_TYPE Release CACHE STRING
+        "Choose the type of build, options are: Debug Release RelWithDebInfo" FORCE)
+endif(WANT_DEBUG)
+mark_as_advanced(CMAKE_BUILD_TYPE)
+
+check_type_size( "int" SIZEOF_INT BUILTIN_TYPES_ONLY )
+check_type_size( "long" SIZEOF_LONG BUILTIN_TYPES_ONLY )
+
+check_include_file( stdint.h HAVE_STDINT_H )
+check_include_file( systems.h HAVE_SYSTEMS_H )
+check_include_file( linux/inotify.h HAVE_INOTIFY )
+
+check_function_exists( statvfs HAVE_STATVFS )

INSTALL

@@ -35,7 +35,7 @@ Now run CMake to generate the build files, and specify the location
 where your system's KDE libraries are installed.  A nice general way
 to do this is:
 
-$ cmake . -DCMAKE_INSTALL_PREFIX=`kde-config --prefix`
+$ cmake . -DCMAKE_INSTALL_PREFIX=`tde-config --prefix`
 
 If you omit the install prefix and just run
 
@@ -68,10 +68,10 @@ By default, the install prefix will be /usr/local. If your KDE is
 installed at some other prefix, you probably want to override this
 setting, as suggested in "A Typical Build with CMake."  You may
 install to /usr/local or anywhere else, but if you do so, you must add
-that location to your KDEDIRS environment variable before running
+that location to your TDEDIRS environment variable before running
 Rosegarden.  For example:
 
-$ export KDEDIRS=/usr/local:$KDEDIRS
+$ export TDEDIRS=/usr/local:$TDEDIRS
 $ rosegarden
 
 Another option, useful for packagers, is setting DESTDIR at install
@@ -114,8 +114,8 @@ $ ccmake .
 Dealing with Configuration Problems
 -----------------------------------
 
-To locate Qt, CMake searches for qmake in your execute path
-($PATH). CMake does not use the QTDIR environment variable. So make
+To locate TQt, CMake searches for qmake in your execute path
+($PATH). CMake does not use the TQTDIR environment variable. So make
 sure that the first qmake found in the execution path is the one you
 like to use.
 

TRANSLATORS

@@ -1,4 +0,0 @@
-Please see the AUTHORS file for a list of translators.
-
-If you'd like to translate Rosegarden into your language, contact us at
-<rosegarden-devel@lists.sourceforge.net>

cmake_admin/FindKDECONFIG.cmake

@@ -1,114 +0,0 @@
-# Rosegarden
-# A MIDI and audio sequencer and musical notation editor.
-#
-# This program is Copyright 2000-2008
-#     Guillaume Laurent   <glaurent@telegraph-road.org>,
-#     Chris Cannam        <cannam@all-day-breakfast.com>,
-#     Richard Bown        <richard.bown@ferventsoftware.com>
-#
-# The moral rights of Guillaume Laurent, Chris Cannam, and Richard
-# Bown to claim authorship of this work have been asserted.
-#
-# This file is Copyright 2006-2008
-#     Pedro Lopez-Cabanillas <plcl@users.sourceforge.net>
-#
-# Other copyrights also apply to some parts of this work.  Please
-# see the AUTHORS file and individual file headers for details.
-#
-# 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; either version 2 of the
-# License, or (at your option) any later version.  See the file
-# COPYING included with this distribution for more information.
-# Find the kde-config program and retrieve the install dirs
-
-# Variables:
-#       HAVE_KDECONFIG
-#       KDECONFIG_EXECUTABLE
-#       KDE3PREFIX
-#       KDE3HTMLDIR
-#       KDE3DATADIR
-#       KDE3ICONDIR
-#       KDE3MIMEDIR
-#       KDE3MENUDIR
-#       KDE3EXECDIR
-#       KDE3L18NDIR
-
-IF(KDECONFIG_EXECUTABLE)
-    SET(HAVE_KDECONFIG TRUE)
-ELSE(KDECONFIG_EXECUTABLE)
-    FIND_PROGRAM(KDECONFIG_EXECUTABLE NAMES kde-config PATHS
-        $ENV{KDEDIR}/bin
-        /opt/trinity/bin
-        /opt/kde/bin
-        NO_DEFAULT_PATH
-    )
-    FIND_PROGRAM(KDECONFIG_EXECUTABLE kde-config)
-ENDIF(KDECONFIG_EXECUTABLE)
-
-IF(NOT KDE3PREFIX)
-    EXECUTE_PROCESS(COMMAND ${KDECONFIG_EXECUTABLE} --version
-                    OUTPUT_VARIABLE kde_config_version )
-    STRING(REGEX MATCH "KDE: .\\." kde_version ${kde_config_version})
-    IF (${kde_version} MATCHES "KDE: 3\\.")
-        EXECUTE_PROCESS(COMMAND ${KDECONFIG_EXECUTABLE} --prefix
-                	OUTPUT_VARIABLE kdedir )
-        STRING(REGEX REPLACE "\n" "" KDE3PREFIX "${kdedir}")
-    ENDIF (${kde_version} MATCHES "KDE: 3\\.")
-ENDIF(NOT KDE3PREFIX)
-
-IF(NOT KDE3HTMLDIR)
-    EXECUTE_PROCESS(COMMAND ${KDECONFIG_EXECUTABLE} --expandvars --install html
-        OUTPUT_VARIABLE _htmlinstalldir)
-    STRING(REGEX REPLACE "\n" "" _htmlinstalldir "${_htmlinstalldir}")
-    STRING(REPLACE "${KDE3PREFIX}/" "" KDE3HTMLDIR "${_htmlinstalldir}")
-    MESSAGE(STATUS "KDE3HTMLDIR : ${KDE3HTMLDIR}")
-ENDIF(NOT KDE3HTMLDIR)
-
-IF(NOT KDE3DATADIR)
-    EXECUTE_PROCESS(COMMAND ${KDECONFIG_EXECUTABLE} --expandvars --install data
-        OUTPUT_VARIABLE _datainstalldir)
-    STRING(REGEX REPLACE "\n" "" _datainstalldir "${_datainstalldir}")
-    STRING(REPLACE "${KDE3PREFIX}/" "" KDE3DATADIR "${_datainstalldir}")
-    MESSAGE(STATUS "KDE3DATADIR : ${KDE3DATADIR}")
-ENDIF(NOT KDE3DATADIR)
-
-IF(NOT KDE3ICONDIR)
-    EXECUTE_PROCESS(COMMAND ${KDECONFIG_EXECUTABLE} --expandvars --install icon
-        OUTPUT_VARIABLE _iconinstalldir)
-    STRING(REGEX REPLACE "\n" "" _iconinstalldir "${_iconinstalldir}")
-    STRING(REPLACE "${KDE3PREFIX}/" "" KDE3ICONDIR "${_iconinstalldir}")
-    MESSAGE(STATUS "KDE3ICONDIR : ${KDE3ICONDIR}")
-ENDIF(NOT KDE3ICONDIR)
-
-IF(NOT KDE3MIMEDIR)
-    EXECUTE_PROCESS(COMMAND ${KDECONFIG_EXECUTABLE} --expandvars --install mime
-        OUTPUT_VARIABLE _mimeinstalldir)
-    STRING(REGEX REPLACE "\n" "" _mimeinstalldir "${_mimeinstalldir}")
-    STRING(REPLACE "${KDE3PREFIX}/" "" KDE3MIMEDIR "${_mimeinstalldir}")
-    MESSAGE(STATUS "KDE3MIMEDIR : ${KDE3MIMEDIR}")
-ENDIF(NOT KDE3MIMEDIR)
-
-IF(NOT KDE3MENUDIR)
-    EXECUTE_PROCESS(COMMAND ${KDECONFIG_EXECUTABLE} --expandvars --install xdgdata-apps
-        OUTPUT_VARIABLE _menuinstalldir)
-    STRING(REGEX REPLACE "\n" "" _menuinstalldir "${_menuinstalldir}")
-    STRING(REPLACE "${KDE3PREFIX}/" "" KDE3MENUDIR "${_menuinstalldir}")
-    MESSAGE(STATUS "KDE3MENUDIR : ${KDE3MENUDIR}")
-ENDIF(NOT KDE3MENUDIR)
-
-IF(NOT KDE3L18NDIR)
-    EXECUTE_PROCESS(COMMAND ${KDECONFIG_EXECUTABLE} --expandvars --install locale
-        OUTPUT_VARIABLE _l18ninstalldir)
-    STRING(REGEX REPLACE "\n" "" _l18ninstalldir "${_l18ninstalldir}")
-    STRING(REPLACE "${KDE3PREFIX}/" "" KDE3L18NDIR "${_l18ninstalldir}")
-    MESSAGE(STATUS "KDE3L18NDIR : ${KDE3L18NDIR}")
-ENDIF(NOT KDE3L18NDIR)
-
-IF(NOT KDE3EXECDIR)
-    EXECUTE_PROCESS(COMMAND ${KDECONFIG_EXECUTABLE} --expandvars --install exe
-        OUTPUT_VARIABLE _execinstalldir)
-    STRING(REGEX REPLACE "\n" "" _execinstalldir "${_execinstalldir}")
-    STRING(REPLACE "${KDE3PREFIX}/" "" KDE3EXECDIR "${_execinstalldir}")
-    MESSAGE(STATUS "KDE3EXECDIR : ${KDE3EXECDIR}")
-ENDIF(NOT KDE3EXECDIR)

cmake_admin/FindLADSPA.cmake

@@ -1,56 +0,0 @@
-# Rosegarden
-# A MIDI and audio sequencer and musical notation editor.
-#
-# This program is Copyright 2000-2008
-#     Guillaume Laurent   <glaurent@telegraph-road.org>,
-#     Chris Cannam        <cannam@all-day-breakfast.com>,
-#     Richard Bown        <richard.bown@ferventsoftware.com>
-#
-# The moral rights of Guillaume Laurent, Chris Cannam, and Richard
-# Bown to claim authorship of this work have been asserted.
-#
-# This file is Copyright 2006-2008
-#     Pedro Lopez-Cabanillas <plcl@users.sourceforge.net>
-#
-# Other copyrights also apply to some parts of this work.  Please
-# see the AUTHORS file and individual file headers for details.
-#
-# 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; either version 2 of the
-# License, or (at your option) any later version.  See the file
-# COPYING included with this distribution for more information.
-
-# - Try to find LADSPA header
-# Once done this will define:
-#
-#  LADSPA_FOUND - system has LADSPA
-#  LADSPA_INCLUDE_DIR - LADSPA header path
-
-IF(LADSPA_INCLUDE_DIR)
-   SET(LADSPA_FIND_QUIETLY TRUE)
-ENDIF(LADSPA_INCLUDE_DIR)
-   
-FIND_PATH(LADSPA_INCLUDE_DIR "ladspa.h"
-   /usr/include
-   /usr/local/include
-)
-
-IF(LADSPA_INCLUDE_DIR)
-   SET(LADSPA_FOUND TRUE)
-ELSE(LADSPA_INCLUDE_DIR)
-   SET(LADSPA_FOUND FALSE)
-   SET(LADSPA_INCLUDE_DIR "")
-ENDIF(LADSPA_INCLUDE_DIR)
-
-IF(LADSPA_FOUND)
-    IF(NOT LADSPA_FIND_QUIETLY)
-        MESSAGE(STATUS "Found LADSPA: ${LADSPA_INCLUDE_DIR}")
-    ENDIF(NOT LADSPA_FIND_QUIETLY)
-ELSE(LADSPA_FOUND)
-    IF(LADSPA_FIND_REQUIRED)
-        MESSAGE(FATAL_ERROR "Could not find LADSPA")
-    ENDIF(LADSPA_FIND_REQUIRED)
-ENDIF(LADSPA_FOUND)
-
-MARK_AS_ADVANCED(LADSPA_INCLUDE_DIR)

cmake_admin/FindLIRC.cmake

@@ -1,64 +0,0 @@
-# Rosegarden
-# A MIDI and audio sequencer and musical notation editor.
-#
-# This program is Copyright 2000-2008
-#     Guillaume Laurent   <glaurent@telegraph-road.org>,
-#     Chris Cannam        <cannam@all-day-breakfast.com>,
-#     Richard Bown        <richard.bown@ferventsoftware.com>
-#
-# The moral rights of Guillaume Laurent, Chris Cannam, and Richard
-# Bown to claim authorship of this work have been asserted.
-#
-# This file is Copyright 2006-2008
-#     Pedro Lopez-Cabanillas <plcl@users.sourceforge.net>
-#
-# Other copyrights also apply to some parts of this work.  Please
-# see the AUTHORS file and individual file headers for details.
-#
-# 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; either version 2 of the
-# License, or (at your option) any later version.  See the file
-# COPYING included with this distribution for more information.
-
-# - Try to find LIRC
-# Once done this will define:
-#
-#  LIRC_FOUND - system has LIRC
-#  LIRC_LIBRARY - LIRC library
-#  LIRC_INCLUDE_DIR - LIRC include path
-#  LIRC_LIBRARY_DIR - LIRC library path
-
-IF(LIRC_INCLUDE_DIR)
-    SET(LIRC_FIND_QUIETLY TRUE)
-ENDIF(LIRC_INCLUDE_DIR)
-
-FIND_PATH(LIRC_INCLUDE_DIR "lirc/lirc_client.h"
-    /usr/include
-    /usr/local/include
-)
-
-FIND_LIBRARY(LIRC_LIBRARY 
-    NAMES lirc_client
-    PATHS /usr/lib /usr/local/lib
-)
-
-IF(LIRC_INCLUDE_DIR AND LIRC_LIBRARY)
-    SET(LIRC_FOUND TRUE)
-    GET_FILENAME_COMPONENT(LIRC_LIBRARY_DIR ${LIRC_LIBRARY} PATH)
-ELSE(LIRC_INCLUDE_DIR AND LIRC_LIBRARY)
-    SET(LIRC_FOUND FALSE)
-    SET(LIRC_LIBRARY_DIR)
-ENDIF(LIRC_INCLUDE_DIR AND LIRC_LIBRARY)
-
-IF(LIRC_FOUND)
-    IF(NOT LIRC_FIND_QUIETLY)
-        MESSAGE(STATUS "Found LIRC: ${LIRC_LIBRARY}")
-    ENDIF(NOT LIRC_FIND_QUIETLY)
-ELSE(LIRC_FOUND)
-    IF(LIRC_FIND_REQUIRED)
-        MESSAGE(FATAL_ERROR "Could not find LIRC library")
-    ENDIF(LIRC_FIND_REQUIRED)
-ENDIF(LIRC_FOUND)
-
-MARK_AS_ADVANCED(LIRC_LIBRARY LIRC_INCLUDE_DIR)

cmake_admin/FindMEINPROC.cmake

@@ -1,74 +0,0 @@
-# Rosegarden
-# A MIDI and audio sequencer and musical notation editor.
-#
-# This program is Copyright 2000-2008
-#     Guillaume Laurent   <glaurent@telegraph-road.org>,
-#     Chris Cannam        <cannam@all-day-breakfast.com>,
-#     Richard Bown        <richard.bown@ferventsoftware.com>
-#
-# The moral rights of Guillaume Laurent, Chris Cannam, and Richard
-# Bown to claim authorship of this work have been asserted.
-#
-# This file is Copyright 2006-2008
-#     Pedro Lopez-Cabanillas <plcl@users.sourceforge.net>
-#
-# Other copyrights also apply to some parts of this work.  Please
-# see the AUTHORS file and individual file headers for details.
-#
-# 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; either version 2 of the
-# License, or (at your option) any later version.  See the file
-# COPYING included with this distribution for more information.
-
-# Find the MEINPROC program
-#
-# Defined variables:
-#  MEINPROC_FOUND
-#  MEINPROC_EXECUTABLE
-#
-# Macro:
-#  ADD_DOCS
-
-IF(MEINPROC_EXECUTABLE)
-    SET(MEINPROC_FOUND TRUE)
-ELSE(MEINPROC_EXECUTABLE)
-    FIND_PROGRAM(MEINPROC_EXECUTABLE
-	NAME meinproc 
-	PATHS ${KDE3_BIN_INSTALL_DIR}
-	 $ENV{KDEDIR}/bin
-	 /usr/bin
-	 /usr/local/bin
-	 /opt/kde/bin
-	 /opt/trinity/bin )
-    IF(MEINPROC_EXECUTABLE)
-	SET(MEINPROC_FOUND TRUE)
-    ELSE(MEINPROC_EXECUTABLE)
-	IF(NOT MEINPROC_FIND_QUIETLY)
-	    IF(MEINPROC_FIND_REQUIRED)
-		MESSAGE(FATAL_ERROR "Program meinproc couldn't be found")
-	    ENDIF(MEINPROC_FIND_REQUIRED)
-	ENDIF(NOT MEINPROC_FIND_QUIETLY)
-    ENDIF(MEINPROC_EXECUTABLE)
-    MARK_AS_ADVANCED(MEINPROC_EXECUTABLE)
-ENDIF (MEINPROC_EXECUTABLE)
-
-MACRO(ADD_DOCS _baseName)
-    SET(_outputs)
-    FOREACH(_dir ${ARGN})
-	SET(_out "${CMAKE_CURRENT_BINARY_DIR}/${_dir}_index.cache.bz2")
-	SET(_in  "${CMAKE_CURRENT_SOURCE_DIR}/${_dir}/index.docbook")
-	FILE(GLOB _images ${_dir}/*.png)
-	ADD_CUSTOM_COMMAND(OUTPUT ${_out}
-	    COMMAND ${MEINPROC_EXECUTABLE}
-	    ARGS --check --cache ${_out} ${_in}
-    	    DEPENDS ${_in} )
-	INSTALL(FILES ${_out}
-    	    DESTINATION ${KDE3HTMLDIR}/${_dir}/${_baseName}
-	    RENAME index.cache.bz2)
-	INSTALL(FILES ${_in} ${_images}
-    	    DESTINATION ${KDE3HTMLDIR}/${_dir}/${_baseName})
-	SET(_outputs ${_outputs} ${_out})
-    ENDFOREACH(_dir)
-    ADD_CUSTOM_TARGET(documentation ALL DEPENDS ${_outputs})
-ENDMACRO(ADD_DOCS)

cmake_admin/FindMSGFMT.cmake

@@ -1,68 +0,0 @@
-# Rosegarden
-# A MIDI and audio sequencer and musical notation editor.
-#
-# This program is Copyright 2000-2008
-#     Guillaume Laurent   <glaurent@telegraph-road.org>,
-#     Chris Cannam        <cannam@all-day-breakfast.com>,
-#     Richard Bown        <richard.bown@ferventsoftware.com>
-#
-# The moral rights of Guillaume Laurent, Chris Cannam, and Richard
-# Bown to claim authorship of this work have been asserted.
-#
-# This file is Copyright 2006-2008
-#     Pedro Lopez-Cabanillas <plcl@users.sourceforge.net>
-#
-# Other copyrights also apply to some parts of this work.  Please
-# see the AUTHORS file and individual file headers for details.
-#
-# 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; either version 2 of the
-# License, or (at your option) any later version.  See the file
-# COPYING included with this distribution for more information.
-
-# Find the msgfmt program
-#
-# Defined variables:
-#  MSGFMT_FOUND
-#  MSGFMT_EXECUTABLE
-#
-# Macro:
-#  ADD_TRANSLATIONS
-#
-
-IF(MSGFMT_EXECUTABLE)
-    SET(MSGFMT_FOUND TRUE)
-ELSE(MSGFMT_EXECUTABLE)
-    FIND_PROGRAM(MSGFMT_EXECUTABLE
-	NAMES msgfmt gmsgfmt
-	PATHS /bin /usr/bin /usr/local/bin )
-    IF(MSGFMT_EXECUTABLE)
-        SET(MSGFMT_FOUND TRUE)
-    ELSE(MSGFMT_EXECUTABLE)
-	IF(NOT MSGFMT_FIND_QUIETLY)
-	    IF(MSGFMT_FIND_REQUIRED)
-                MESSAGE(FATAL_ERROR "msgfmt program couldn't be found")
-	    ENDIF(MSGFMT_FIND_REQUIRED)
-	ENDIF(NOT MSGFMT_FIND_QUIETLY)
-    ENDIF(MSGFMT_EXECUTABLE)
-    MARK_AS_ADVANCED(MSGFMT_EXECUTABLE)
-ENDIF (MSGFMT_EXECUTABLE)
-
-MACRO(ADD_TRANSLATIONS _baseName)
-    SET(_outputs)
-    FOREACH(_file ${ARGN})
-	GET_FILENAME_COMPONENT(_file_we ${_file} NAME_WE)
-	SET(_out "${CMAKE_CURRENT_BINARY_DIR}/${_file_we}.gmo")
-	SET(_in  "${CMAKE_CURRENT_SOURCE_DIR}/${_file_we}.po")
-	ADD_CUSTOM_COMMAND(
-	    OUTPUT ${_out}
-	    COMMAND ${MSGFMT_EXECUTABLE} -o ${_out} ${_in}
-	    DEPENDS ${_in} )
-	INSTALL(FILES ${_out}
-	    DESTINATION ${KDE3L18NDIR}/${_file_we}/LC_MESSAGES/
-	    RENAME ${_baseName}.mo )
-	SET(_outputs ${_outputs} ${_out})
-    ENDFOREACH(_file)
-    ADD_CUSTOM_TARGET(translations ALL DEPENDS ${_outputs})
-ENDMACRO(ADD_TRANSLATIONS)

cmake_admin/FindPCHSupport.cmake

@@ -1,73 +0,0 @@
-# Rosegarden
-# A MIDI and audio sequencer and musical notation editor.
-#
-# This program is Copyright 2000-2008
-#     Guillaume Laurent   <glaurent@telegraph-road.org>,
-#     Chris Cannam        <cannam@all-day-breakfast.com>,
-#     Richard Bown        <richard.bown@ferventsoftware.com>
-#
-# The moral rights of Guillaume Laurent, Chris Cannam, and Richard
-# Bown to claim authorship of this work have been asserted.
-#
-# This file is Copyright 2006-2008
-#     Pedro Lopez-Cabanillas <plcl@users.sourceforge.net>
-#
-# Other copyrights also apply to some parts of this work.  Please
-# see the AUTHORS file and individual file headers for details.
-#
-# 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; either version 2 of the
-# License, or (at your option) any later version.  See the file
-# COPYING included with this distribution for more information.
-
-# - Try to find precompiled headers support for GCC 3.4 and 4.x
-# Once done this will define:
-#
-# Variable:
-#   PCHSupport_FOUND
-#
-# Macro:
-#   ADD_PRECOMPILED_HEADER
-
-IF(CMAKE_COMPILER_IS_GNUCXX)
-    EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
-                 ARGS -dumpversion
-                 OUTPUT_VARIABLE gcc_compiler_version)
-#   STRING(REGEX REPLACE ".* ([0-9]\\.[0-9]\\.[0-9]) .*" "\\1" 
-#          gcc_compiler_version ${_compiler_output})
-#   MESSAGE("GCC Version: ${gcc_compiler_version}")
-    IF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
-        SET(PCHSupport_FOUND TRUE)
-    ELSE(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
-        IF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]")
-            SET(PCHSupport_FOUND TRUE)
-        ENDIF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]")
-    ENDIF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-
-MACRO(ADD_PRECOMPILED_HEADER _targetName _input)
-    GET_FILENAME_COMPONENT(_name ${_input} NAME)
-    SET(_source "${CMAKE_CURRENT_SOURCE_DIR}/${_input}")
-    SET(_outdir "${CMAKE_CURRENT_BINARY_DIR}/${_name}.gch")
-    MAKE_DIRECTORY(${_outdir})
-    SET(_output "${_outdir}/${CMAKE_BUILD_TYPE}.c++")
-    STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name)
-    SET(_compiler_FLAGS ${${_flags_var_name}})
-    SEPARATE_ARGUMENTS(_compiler_FLAGS)
-    #MESSAGE("_compiler_FLAGS: ${_compiler_FLAGS}")
-    ADD_CUSTOM_COMMAND(
-        OUTPUT ${_output}
-        COMMAND ${CMAKE_CXX_COMPILER}
-           ${_compiler_FLAGS}
-           -I${QT_INCLUDE_DIR}
-           -I${KDE3_INCLUDE_DIR}
-           ${QT_DEFINITIONS}
-           ${KDE3_DEFINITIONS}
-           -x c++-header
-           -o ${_output} ${_source}
-        DEPENDS ${_source} )
-    ADD_CUSTOM_TARGET(${_targetName} DEPENDS ${_output})
-    #SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-include ${_name} -Winvalid-pch -H")
-    SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-include ${_name} -Winvalid-pch")
-ENDMACRO(ADD_PRECOMPILED_HEADER)

cmake_admin/FindPkgConfig.cmake

@@ -1,383 +0,0 @@
-# - a pkg-config module for CMake
-#
-# Usage:
-#   pkg_check_modules(<PREFIX> [REQUIRED] <MODULE> [<MODULE>]*)
-#     checks for all the given modules
-#
-#   pkg_search_module(<PREFIX> [REQUIRED] <MODULE> [<MODULE>]*)
-#     checks for given modules and uses the first working one
-#
-# When the 'REQUIRED' argument was set, macros will fail with an error
-# when module(s) could not be found
-#
-# It sets the following variables:
-#   PKG_CONFIG_FOUND         ... true iff pkg-config works on the system
-#   PKG_CONFIG_EXECUTABLE    ... pathname of the pkg-config program
-#   <PREFIX>_FOUND           ... set to 1 iff module(s) exist
-#
-# For the following variables two sets of values exist; first one is the
-# common one and has the given PREFIX. The second set contains flags
-# which are given out when pkgconfig was called with the '--static'
-# option.
-#   <XPREFIX>_LIBRARIES      ... only the libraries (w/o the '-l')
-#   <XPREFIX>_LIBRARY_DIRS   ... the paths of the libraries (w/o the '-L')
-#   <XPREFIX>_LDFLAGS        ... all required linker flags
-#   <XPREFIX>_LDFLAGS_OTHERS ... all other linker flags
-#   <XPREFIX>_INCLUDE_DIRS   ... the '-I' preprocessor flags (w/o the '-I')
-#   <XPREFIX>_CFLAGS         ... all required cflags
-#   <XPREFIX>_CFLAGS_OTHERS  ... the other compiler flags
-#
-#   <XPREFIX> = <PREFIX>        for common case
-#   <XPREFIX> = <PREFIX>_STATIC for static linking
-#
-# There are some special variables whose prefix depends on the count
-# of given modules. When there is only one module, <PREFIX> stays
-# unchanged. When there are multiple modules, the prefix will be
-# changed to <PREFIX>_<MODNAME>:
-#   <XPREFIX>_VERSION    ... version of the module
-#   <XPREFIX>_PREFIX     ... prefix-directory of the module
-#   <XPREFIX>_INCLUDEDIR ... include-dir of the module
-#   <XPREFIX>_LIBDIR     ... lib-dir of the module
-#
-#   <XPREFIX> = <PREFIX>  when |MODULES| == 1, else
-#   <XPREFIX> = <PREFIX>_<MODNAME>
-#
-# A <MODULE> parameter can have the following formats:
-#   {MODNAME}            ... matches any version
-#   {MODNAME}>={VERSION} ... at least version <VERSION> is required
-#   {MODNAME}={VERSION}  ... exactly version <VERSION> is required
-#   {MODNAME}<={VERSION} ... modules must not be newer than <VERSION>
-#
-# Examples
-#   pkg_check_modules (GLIB2   glib-2.0)
-#
-#   pkg_check_modules (GLIB2   glib-2.0>=2.10)
-#     requires at least version 2.10 of glib2 and defines e.g.
-#       GLIB2_VERSION=2.10.3
-#
-#   pkg_check_modules (FOO     glib-2.0>=2.10 gtk+-2.0)
-#     requires both glib2 and gtk2, and defines e.g.
-#       FOO_glib-2.0_VERSION=2.10.3
-#       FOO_gtk+-2.0_VERSION=2.8.20
-#
-#   pkg_check_modules (XRENDER REQUIRED xrender)
-#     defines e.g.:
-#       XRENDER_LIBRARIES=Xrender;X11
-#       XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp
-#
-#   pkg_search_module (BAR     libxml-2.0 libxml2 libxml>=2)
-
-
-# Copyright (C) 2006 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
-#
-# Redistribution and use, with or without modification, are permitted
-# provided that the following conditions are met:
-# 
-#    1. Redistributions must retain the above copyright notice, this
-#       list of conditions and the following disclaimer.
-#    2. The name of the author may not be used to endorse or promote
-#       products derived from this software without specific prior
-#       written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-### Common stuff ####
-set(PKG_CONFIG_VERSION 1)
-set(PKG_CONFIG_FOUND   0)
-
-find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
-mark_as_advanced(PKG_CONFIG_EXECUTABLE)
-
-if(PKG_CONFIG_EXECUTABLE)
-  set(PKG_CONFIG_FOUND 1)
-endif(PKG_CONFIG_EXECUTABLE)
-
-
-# Unsets the given variables
-macro(_pkgconfig_unset var)
-  set(${var} "" CACHE INTERNAL "")
-endmacro(_pkgconfig_unset)
-
-macro(_pkgconfig_set var value)
-  set(${var} ${value} CACHE INTERNAL "")
-endmacro(_pkgconfig_set)
-
-# Invokes pkgconfig, cleans up the result and sets variables
-macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp)
-  set(_pkgconfig_invoke_result)
-
-  execute_process(
-    COMMAND ${PKG_CONFIG_EXECUTABLE} ${ARGN} ${_pkglist}
-    OUTPUT_VARIABLE _pkgconfig_invoke_result
-    RESULT_VARIABLE _pkgconfig_failed)
-
-  if (_pkgconfig_failed)
-    set(_pkgconfig_${_varname} "")
-    _pkgconfig_unset(${_prefix}_${_varname})
-  else(_pkgconfig_failed)
-    string(REGEX REPLACE "[\r\n]"                  " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
-    string(REGEX REPLACE " +$"                     ""  _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
-
-    if (NOT ${_regexp} STREQUAL "")
-      string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
-    endif(NOT ${_regexp} STREQUAL "")
-
-    separate_arguments(_pkgconfig_invoke_result)
-
-    #message(STATUS "  ${_varname} ... ${_pkgconfig_invoke_result}")
-    set(_pkgconfig_${_varname} ${_pkgconfig_invoke_result})
-    _pkgconfig_set(${_prefix}_${_varname} "${_pkgconfig_invoke_result}")
-  endif(_pkgconfig_failed)
-endmacro(_pkgconfig_invoke)
-
-# Invokes pkgconfig two times; once without '--static' and once with
-# '--static'
-macro(_pkgconfig_invoke_dyn _pkglist _prefix _varname cleanup_regexp)
-  _pkgconfig_invoke("${_pkglist}" ${_prefix}        ${_varname} "${cleanup_regexp}" ${ARGN})
-  _pkgconfig_invoke("${_pkglist}" ${_prefix} STATIC_${_varname} "${cleanup_regexp}" --static  ${ARGN})
-endmacro(_pkgconfig_invoke_dyn)
-
-# Splits given arguments into options and a package list
-macro(_pkgconfig_parse_options _result _is_req)
-  set(${_is_req} 0)
-  
-  foreach(_pkg ${ARGN})
-    if (_pkg STREQUAL "REQUIRED")
-      set(${_is_req} 1)
-    endif (_pkg STREQUAL "REQUIRED")
-  endforeach(_pkg ${ARGN})
-
-  set(${_result} ${ARGN})
-  list(REMOVE_ITEM ${_result} "REQUIRED")
-endmacro(_pkgconfig_parse_options)
-
-###
-macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
-  _pkgconfig_unset(${_prefix}_FOUND)
-  _pkgconfig_unset(${_prefix}_VERSION)
-  _pkgconfig_unset(${_prefix}_PREFIX)
-  _pkgconfig_unset(${_prefix}_INCLUDEDIR)
-  _pkgconfig_unset(${_prefix}_LIBDIR)
-  _pkgconfig_unset(${_prefix}_LIBS)
-  _pkgconfig_unset(${_prefix}_LIBS_L)
-  _pkgconfig_unset(${_prefix}_LIBS_PATHS)
-  _pkgconfig_unset(${_prefix}_LIBS_OTHER)
-  _pkgconfig_unset(${_prefix}_CFLAGS)
-  _pkgconfig_unset(${_prefix}_CFLAGS_I)
-  _pkgconfig_unset(${_prefix}_CFLAGS_OTHER)
-  _pkgconfig_unset(${_prefix}_STATIC_LIBDIR)
-  _pkgconfig_unset(${_prefix}_STATIC_LIBS)
-  _pkgconfig_unset(${_prefix}_STATIC_LIBS_L)
-  _pkgconfig_unset(${_prefix}_STATIC_LIBS_PATHS)
-  _pkgconfig_unset(${_prefix}_STATIC_LIBS_OTHER)
-  _pkgconfig_unset(${_prefix}_STATIC_CFLAGS)
-  _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_I)
-  _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_OTHER)
-
-  # create a better addressable variable of the modules and calculate its size
-  set(_pkg_check_modules_list ${ARGN})
-  list(LENGTH _pkg_check_modules_list _pkg_check_modules_cnt)
-
-  if(PKG_CONFIG_EXECUTABLE)
-    # give out status message telling checked module
-    if (NOT ${_is_silent})
-      if (_pkg_check_modules_cnt EQUAL 1)
-        message(STATUS "checking for module '${_pkg_check_modules_list}'")
-      else(_pkg_check_modules_cnt EQUAL 1)
-        message(STATUS "checking for modules '${_pkg_check_modules_list}'")
-      endif(_pkg_check_modules_cnt EQUAL 1)
-    endif(NOT ${_is_silent})
-    
-    set(_pkg_check_modules_packages)
-    set(_pkg_check_modules_failed)
-
-    # iterate through module list and check whether they exist and match the required version
-    foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list})
-      set(_pkg_check_modules_exist_query)
-
-      # check whether version is given
-      if (_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*")
-        string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\1" _pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}")
-        string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\2" _pkg_check_modules_pkg_op   "${_pkg_check_modules_pkg}")
-        string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\3" _pkg_check_modules_pkg_ver  "${_pkg_check_modules_pkg}")
-      else(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*")
-        set(_pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}")
-        set(_pkg_check_modules_pkg_op)
-        set(_pkg_check_modules_pkg_ver)
-      endif(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*")
-
-      # handle the operands
-      if (_pkg_check_modules_pkg_op STREQUAL ">=")
-        list(APPEND _pkg_check_modules_exist_query --atleast-version)
-      endif(_pkg_check_modules_pkg_op STREQUAL ">=")
-
-      if (_pkg_check_modules_pkg_op STREQUAL "=")
-        list(APPEND _pkg_check_modules_exist_query --exact-version)
-      endif(_pkg_check_modules_pkg_op STREQUAL "=")
-      
-      if (_pkg_check_modules_pkg_op STREQUAL "<=")
-        list(APPEND _pkg_check_modules_exist_query --max-version)
-      endif(_pkg_check_modules_pkg_op STREQUAL "<=")
-
-      # create the final query which is of the format:
-      # * --atleast-version <version> <pkg-name>
-      # * --exact-version <version> <pkg-name>      
-      # * --max-version <version> <pkg-name>
-      # * --exists <pkg-name>
-      if (_pkg_check_modules_pkg_op)
-        list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_ver}")
-      else(_pkg_check_modules_pkg_op)
-        list(APPEND _pkg_check_modules_exist_query --exists)
-      endif(_pkg_check_modules_pkg_op)
-
-      _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_VERSION)
-      _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_PREFIX)
-      _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_INCLUDEDIR)
-      _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_LIBDIR)
-
-      list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name}")
-      list(APPEND _pkg_check_modules_packages    "${_pkg_check_modules_pkg_name}")
-
-      # execute the query
-      execute_process(
-        COMMAND ${PKG_CONFIG_EXECUTABLE} ${_pkg_check_modules_exist_query}
-        RESULT_VARIABLE _pkgconfig_retval)
-
-      # evaluate result and tell failures
-      if (_pkgconfig_retval)
-        if(NOT ${_is_silent})
-          message(STATUS "  package '${_pkg_check_modules_pkg}' not found")
-        endif(NOT ${_is_silent})
-
-        set(_pkg_check_modules_failed 1)
-      endif(_pkgconfig_retval)
-    endforeach(_pkg_check_modules_pkg)
-
-    if(_pkg_check_modules_failed)
-      # fail when requested
-      if (${_is_required})
-        message(SEND_ERROR "A required package was not found")
-      endif (${_is_required})
-    else(_pkg_check_modules_failed)
-      # when we are here, we checked whether requested modules
-      # exist. Now, go through them and set variables
-      
-      _pkgconfig_set(${_prefix}_FOUND 1)
-      list(LENGTH _pkg_check_modules_packages pkg_count)
-
-      # iterate through all modules again and set individual variables
-      foreach (_pkg_check_modules_pkg ${_pkg_check_modules_packages})
-        # handle case when there is only one package required
-        if (pkg_count EQUAL 1)
-          set(_pkg_check_prefix "${_prefix}")
-        else(pkg_count EQUAL 1)
-          set(_pkg_check_prefix "${_prefix}_${_pkg_check_modules_pkg}")
-        endif(pkg_count EQUAL 1)
-        
-        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" VERSION    ""   --modversion )
-        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" PREFIX     ""   --variable=prefix )
-        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" INCLUDEDIR ""   --variable=includedir )
-        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" LIBDIR     ""   --variable=libdir )
-
-        message(STATUS "  found ${_pkg_check_modules_pkg}, version ${_pkgconfig_VERSION}")
-      endforeach(_pkg_check_modules_pkg)
-
-      # set variables which are combined for multiple modules
-      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARIES           "(^| )-l" --libs-only-l )
-      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARY_DIRS        "(^| )-L" --libs-only-L )
-      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS             ""        --libs )
-      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS_OTHER       ""        --libs-only-other )
-
-      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" INCLUDE_DIRS        "(^| )-I" --cflags-only-I )
-      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS              ""        --cflags )
-      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS_OTHER        ""        --cflags-only-other )
-    endif(_pkg_check_modules_failed)
-  else(PKG_CONFIG_EXECUTABLE)
-    if (${_is_required})
-      message(SEND_ERROR "pkg-config tool not found")
-    endif (${_is_required})
-  endif(PKG_CONFIG_EXECUTABLE)
-endmacro(_pkg_check_modules_internal)
-
-###
-### User visible macros start here
-###
-
-###
-macro(pkg_check_modules _prefix _module0)
-  # check cached value
-  if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION})
-    _pkgconfig_parse_options   (_pkg_modules _pkg_is_required "${_module0}" ${ARGN})
-    _pkg_check_modules_internal("${_pkg_is_required}" 0 "${_prefix}" ${_pkg_modules})
-
-    if(${_prefix}_FOUND)
-      _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
-    endif(${_prefix}_FOUND)
-  endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION})
-endmacro(pkg_check_modules)
-
-###
-macro(pkg_search_module _prefix _module0)
-  # check cached value
-  if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION})
-    set(_pkg_modules_found 0)
-    _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required "${_module0}" ${ARGN})
-
-    message(STATUS "checking for one of the modules '${_pkg_modules_alt}'")
-
-    # iterate through all modules and stop at the first working one.
-    foreach(_pkg_alt ${_pkg_modules_alt})
-      if(NOT _pkg_modules_found)
-        _pkg_check_modules_internal(0 1 "${_prefix}" "${_pkg_alt}")
-      endif(NOT _pkg_modules_found)
-
-      if (${_prefix}_FOUND)
-        set(_pkg_modules_found 1)
-      endif(${_prefix}_FOUND)
-    endforeach(_pkg_alt)
-
-    if (NOT ${_prefix}_FOUND)
-      if(${_pkg_is_required})
-        message(SEND_ERROR "None of the required '${_pkg_modules_alt}' found")
-      endif(${_pkg_is_required})
-    else (NOT ${_prefix}_FOUND)
-      _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
-    endif(NOT ${_prefix}_FOUND)
-
-  endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION})  
-endmacro(pkg_search_module)
-
-### 
-macro(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
-  message(STATUS "WARNING: you are using the obsolete 'PKGCONFIG' macro")
-  _pkg_check_modules_internal(0 0 _PKGCONFIG_TMP "${_package}")
-  if (_PKGCONFIG_TMP_FOUND)
-    set(${_include_DIR} ${_PKGCONFIG_TMP_INCLUDEDIR})
-    set(${_link_DIR}    ${_PKGCONFIG_TMP_LIBDIR})
-    set(${_link_FLAGS}  ${_PKGCONFIG_TMP_LDFLAGS})
-    set(${_cflags}      ${_PKGCONFIG_TMP_CFLAGS})
-    set(_return_VALUE 0)
-  else(_PKGCONFIG_TMP_FOUND)
-    set(${_include_DIR})
-    set(${_link_DIR})
-    set(${_link_FLAGS})
-    set(${_cflags})
-    set(_return_VALUE 1)
-  endif(_PKGCONFIG_TMP_FOUND)
-endmacro(PKGCONFIG)
-    
-
-### Local Variables:
-### mode: cmake
-### End:

cmake_admin/UserWarnings.cmake

@@ -1,110 +0,0 @@
-# Rosegarden
-# A MIDI and audio sequencer and musical notation editor.
-#
-# This program is Copyright 2000-2008
-#     Guillaume Laurent   <glaurent@telegraph-road.org>,
-#     Chris Cannam        <cannam@all-day-breakfast.com>,
-#     Richard Bown        <richard.bown@ferventsoftware.com>
-#
-# The moral rights of Guillaume Laurent, Chris Cannam, and Richard
-# Bown to claim authorship of this work have been asserted.
-#
-# This file is Copyright 2006-2008
-#     Pedro Lopez-Cabanillas <plcl@users.sourceforge.net>
-#
-# Other copyrights also apply to some parts of this work.  Please
-# see the AUTHORS file and individual file headers for details.
-#
-# 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; either version 2 of the
-# License, or (at your option) any later version.  See the file
-# COPYING included with this distribution for more information.
-
-MESSAGE("\n"
-"Installation Summary\n"
-"--------------------\n"
-"\n"
-"Install Directory             : ${CMAKE_INSTALL_PREFIX}\n"
-"Build type                    : ${CMAKE_BUILD_TYPE}\n"
-"Use Qt/KDE precompiled headers: ${USE_PCH}\n"
-"\n"
-"Xft notation font support     : ${HAVE_XFT}")
-
-IF(WANT_LIRC)
-MESSAGE(
-"LIRC infrared remote support  : ${HAVE_LIRC}")
-ELSE(WANT_LIRC)
-MESSAGE("No LIRC support configured.")
-ENDIF(WANT_LIRC)
-
-MESSAGE("")
-
-IF(WANT_SOUND)
-MESSAGE(
-"ALSA MIDI support             : ${HAVE_ALSA}\n"
-"JACK audio support            : ${HAVE_JACK}\n"
-"LADSPA plugin support         : ${HAVE_LADSPA}\n"
-"DSSI synth plugin support     : ${HAVE_DSSI}\n"
-"Custom OSC plugin GUI support : ${HAVE_LIBLO}\n"
-"Audio timestretching          : ${HAVE_FFTW3F}\n"
-"LRDF plugin metadata support  : ${HAVE_LIBLRDF}")
-ELSE(WANT_SOUND)
-MESSAGE("No sound support configured.")
-ENDIF(WANT_SOUND)
-
-IF(NOT HAVE_XFT)
-MESSAGE("\n* Score rendering quality and performance may be\n"
-"improved if Xft 2.1.0 and Freetype 2 are available, to permit\n"
-"Rosegarden to override the Qt font selection mechanism.  It\n"
-"may not be worth trying to install them if they aren't already\n"
-"present in your distribution though.")
-ENDIF(NOT HAVE_XFT)
-
-IF(WANT_SOUND)
-
-IF(NOT HAVE_ALSA)
-MESSAGE("\n* Rosegarden requires the ALSA (Advanced Linux Sound Architecture) drivers\n"
-"for MIDI, and the JACK audio framework for audio sequencing.\n"
-"Please see the documentation at http://www.rosegardenmusic.com/getting/\n"
-"for more information about these dependencies.")
-ENDIF(NOT HAVE_ALSA)
-		
-IF(NOT HAVE_JACK)
-MESSAGE("\n* Rosegarden uses the JACK audio server for audio recording and\n"
-"sequencing.  See http://jackit.sf.net/ for more information about\n"
-"getting and installing JACK.  If you want to use Rosegarden only\n"
-"for MIDI, then you do not need JACK.")
-ENDIF(NOT HAVE_JACK)
-
-IF(NOT HAVE_LADSPA)
-MESSAGE("\n* Rosegarden supports LADSPA audio plugins if available.  See\n"
-"http://www.ladspa.org/ for more information about LADSPA.  To\n"
-"build LADSPA support into Rosegarden, you need to make sure\n"
-"you have ladspa.h available on your system.")
-ENDIF(NOT HAVE_LADSPA)
-
-IF(NOT HAVE_DSSI)
-MESSAGE("\n* Rosegarden supports DSSI audio plugins if available.  See\n"
-"http://dssi.sf.net/ for more information about DSSI.  To\n"
-"build DSSI support into Rosegarden, you need to make sure\n"
-"you have dssi.h available on your system.")
-ENDIF(NOT HAVE_DSSI)
-
-IF(NOT HAVE_LIBLO)
-MESSAGE("\n* Rosegarden supports custom GUIs for DSSI (and LADSPA) plugins using\n"
-"the Open Sound Control protocol, if the Lite OSC library liblo is\n"
-"available.  Go to http://www.plugin.org.uk/liblo/ to obtain liblo\n"
-"and http://dssi.sf.net/ for more information about DSSI GUIs.")
-ENDIF(NOT HAVE_LIBLO)
-
-IF(NOT HAVE_LIBLRDF)
-MESSAGE("\n* Rosegarden supports the LRDF metadata format for classification\n"
-"of LADSPA and DSSI plugins.  This will improve the usability of\n"
-"plugin selection dialogs.  You can obtain LRDF from\n"
-"http://www.plugin.org.uk/lrdf/.")
-ENDIF(NOT HAVE_LIBLRDF)
-
-ENDIF(WANT_SOUND)
-
-MESSAGE("")

cmake_admin/cmake_uninstall.cmake.in

@@ -1,22 +0,0 @@
-IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-  MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
-ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-
-FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
-STRING(REGEX REPLACE "\n" ";" files "${files}")
-FOREACH(file ${files})
-  MESSAGE(STATUS "Uninstalling \"${file}\"")
-  IF(EXISTS "${file}")
-    EXEC_PROGRAM(
-      "@CMAKE_COMMAND@" ARGS "-E remove \"${file}\""
-      OUTPUT_VARIABLE rm_out
-      RETURN_VALUE rm_retval
-      )
-    IF("${rm_retval}" STREQUAL 0)
-    ELSE("${rm_retval}" STREQUAL 0)
-      MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"")
-    ENDIF("${rm_retval}" STREQUAL 0)
-  ELSE(EXISTS "${file}")
-    MESSAGE(STATUS "File \"${file}\" does not exist.")
-  ENDIF(EXISTS "${file}")
-ENDFOREACH(file)

config.h.cmake

@@ -0,0 +1,5 @@
+#cmakedefine SIZEOF_INT @SIZEOF_INT@
+#cmakedefine SIZEOF_LONG @SIZEOF_LONG@
+#cmakedefine HAVE_STDINT_H 1
+#cmakedefine HAVE_SYSTEMS_H 1
+#cmakedefine HAVE_STATVFS 1

data/CMakeLists.txt

@@ -1,90 +1,93 @@
 # Data directory
 
-SET(DATADIR ${KDE3DATADIR}/rosegarden)
-SET(ICONDIR ${KDE3ICONDIR})
-SET(MIMEDIR ${KDE3MIMEDIR}/audio)
-SET(MENUDIR ${KDE3MENUDIR})
+set(DATADIR ${DATA_INSTALL_DIR}/rosegarden)
+set(ICONDIR ${ICON_INSTALL_DIR})
+set(MIMEDIR ${MIME_INSTALL_DIR}/audio)
+set(MENUDIR ${XDG_MENU_INSTALL_DIR})
 
 # Guitar chord files
-FILE(GLOB CHORD_FILES chords/*.xml)
-INSTALL(FILES ${CHORD_FILES} DESTINATION ${DATADIR}/chords)
+file(GLOB CHORD_FILES chords/*.xml)
+install(FILES ${CHORD_FILES} DESTINATION ${DATADIR}/chords)
 
 # Desktop file
-INSTALL(FILES desktop/rosegarden.desktop DESTINATION ${MENUDIR})
+tde_create_translated_desktop( desktop/rosegarden.desktop )
 
 # MIME files
-SET(MIME_FILES
+tde_create_translated_desktop(
+    SOURCE
         desktop/x-rosegarden21.desktop
         desktop/x-rosegarden.desktop
         desktop/x-rosegarden-device.desktop
-        desktop/x-soundfont.desktop)
-INSTALL(FILES ${MIME_FILES} DESTINATION ${MIMEDIR})
+        desktop/x-soundfont.desktop
+
+    DESTINATION ${MIMEDIR}
+)
 
 # Icons
-INSTALL(FILES pixmaps/icons/cc-hi16-rosegarden.xpm      DESTINATION ${ICONDIR}/locolor/16x16/apps   RENAME rosegarden.xpm)
-INSTALL(FILES pixmaps/icons/rg-rwb-rose3-16x16.png      DESTINATION ${ICONDIR}/hicolor/16x16/apps   RENAME rosegarden.png)
-INSTALL(FILES pixmaps/icons/cc-hi32-rosegarden.xpm      DESTINATION ${ICONDIR}/locolor/32x32/apps   RENAME rosegarden.xpm)
-INSTALL(FILES pixmaps/icons/rg-rwb-rose3-32x32.png      DESTINATION ${ICONDIR}/hicolor/32x32/apps   RENAME rosegarden.png)
-INSTALL(FILES pixmaps/icons/rg-rwb-rose3-48x48.png      DESTINATION ${ICONDIR}/hicolor/48x48/apps   RENAME rosegarden.png)
-INSTALL(FILES pixmaps/icons/rg-rwb-rose3-64x64.png      DESTINATION ${ICONDIR}/hicolor/64x64/apps   RENAME rosegarden.png)
-INSTALL(FILES pixmaps/icons/rg-rwb-rose3-128x128.png    DESTINATION ${ICONDIR}/hicolor/128x128/apps RENAME rosegarden.png)
-
-INSTALL(FILES pixmaps/icons/mm-mime-hi16-rosegarden.png DESTINATION ${ICONDIR}/hicolor/16x16/mimetypes RENAME x-rosegarden.png)
-INSTALL(FILES pixmaps/icons/mm-mime-hi16-rosegarden.png DESTINATION ${ICONDIR}/locolor/16x16/mimetypes RENAME x-rosegarden.png)
-INSTALL(FILES pixmaps/icons/mm-mime-hi32-rosegarden.png DESTINATION ${ICONDIR}/hicolor/32x32/mimetypes RENAME x-rosegarden.png)
-INSTALL(FILES pixmaps/icons/mm-mime-hi32-rosegarden.png DESTINATION ${ICONDIR}/locolor/32x32/mimetypes RENAME x-rosegarden.png)
+install(FILES pixmaps/icons/cc-hi16-rosegarden.xpm      DESTINATION ${ICONDIR}/locolor/16x16/apps   RENAME rosegarden.xpm)
+install(FILES pixmaps/icons/rg-rwb-rose3-16x16.png      DESTINATION ${ICONDIR}/hicolor/16x16/apps   RENAME rosegarden.png)
+install(FILES pixmaps/icons/cc-hi32-rosegarden.xpm      DESTINATION ${ICONDIR}/locolor/32x32/apps   RENAME rosegarden.xpm)
+install(FILES pixmaps/icons/rg-rwb-rose3-32x32.png      DESTINATION ${ICONDIR}/hicolor/32x32/apps   RENAME rosegarden.png)
+install(FILES pixmaps/icons/rg-rwb-rose3-48x48.png      DESTINATION ${ICONDIR}/hicolor/48x48/apps   RENAME rosegarden.png)
+install(FILES pixmaps/icons/rg-rwb-rose3-64x64.png      DESTINATION ${ICONDIR}/hicolor/64x64/apps   RENAME rosegarden.png)
+install(FILES pixmaps/icons/rg-rwb-rose3-128x128.png    DESTINATION ${ICONDIR}/hicolor/128x128/apps RENAME rosegarden.png)
+
+install(FILES pixmaps/icons/mm-mime-hi16-rosegarden.png DESTINATION ${ICONDIR}/hicolor/16x16/mimetypes RENAME x-rosegarden.png)
+install(FILES pixmaps/icons/mm-mime-hi16-rosegarden.png DESTINATION ${ICONDIR}/locolor/16x16/mimetypes RENAME x-rosegarden.png)
+install(FILES pixmaps/icons/mm-mime-hi32-rosegarden.png DESTINATION ${ICONDIR}/hicolor/32x32/mimetypes RENAME x-rosegarden.png)
+install(FILES pixmaps/icons/mm-mime-hi32-rosegarden.png DESTINATION ${ICONDIR}/locolor/32x32/mimetypes RENAME x-rosegarden.png)
 
 # styles
-FILE(GLOB STYLES_FILES styles/*.xml)
-INSTALL(FILES ${STYLES_FILES} DESTINATION ${DATADIR}/styles)
+file(GLOB STYLES_FILES styles/*.xml)
+install(FILES ${STYLES_FILES} DESTINATION ${DATADIR}/styles)
 
 # presets
-FILE(GLOB PRESETS_FILES presets/*.xml)
-INSTALL(FILES ${PRESETS_FILES} DESTINATION ${DATADIR}/presets)
+file(GLOB PRESETS_FILES presets/*.xml)
+install(FILES ${PRESETS_FILES} DESTINATION ${DATADIR}/presets)
 
 # fonts
-FILE(GLOB PFA_FILES fonts/*.pfa)
-INSTALL(FILES ${PFA_FILES} DESTINATION ${DATADIR}/fonts)
+file(GLOB PFA_FILES fonts/*.pfa)
+install(FILES ${PFA_FILES} DESTINATION ${DATADIR}/fonts)
 
-FILE(GLOB XML_FILES fonts/mappings/*.xml)
-INSTALL(FILES ${XML_FILES} DESTINATION ${DATADIR}/fonts/mappings)
+file(GLOB XML_FILES fonts/mappings/*.xml)
+install(FILES ${XML_FILES} DESTINATION ${DATADIR}/fonts/mappings)
 
-FILE(GLOB XPM_FILES pixmaps/rg21/4/*.xpm)
-INSTALL(FILES ${XPM_FILES} DESTINATION ${DATADIR}/fonts/rg21/4)
+file(GLOB XPM_FILES pixmaps/rg21/4/*.xpm)
+install(FILES ${XPM_FILES} DESTINATION ${DATADIR}/fonts/rg21/4)
 
-FILE(GLOB XPM_FILES pixmaps/rg21/8/*.xpm)
-INSTALL(FILES ${XPM_FILES} DESTINATION ${DATADIR}/fonts/rg21/8)
+file(GLOB XPM_FILES pixmaps/rg21/8/*.xpm)
+install(FILES ${XPM_FILES} DESTINATION ${DATADIR}/fonts/rg21/8)
 
-FILE(GLOB XPM_FILES pixmaps/feta/4/*.xpm)
-INSTALL(FILES ${XPM_FILES} DESTINATION ${DATADIR}/fonts/feta/4)
+file(GLOB XPM_FILES pixmaps/feta/4/*.xpm)
+install(FILES ${XPM_FILES} DESTINATION ${DATADIR}/fonts/feta/4)
 
-FILE(GLOB XPM_FILES pixmaps/feta/6/*.xpm)
-INSTALL(FILES ${XPM_FILES} DESTINATION ${DATADIR}/fonts/feta/6)
+file(GLOB XPM_FILES pixmaps/feta/6/*.xpm)
+install(FILES ${XPM_FILES} DESTINATION ${DATADIR}/fonts/feta/6)
 
-FILE(GLOB XPM_FILES pixmaps/feta/8/*.xpm)
-INSTALL(FILES ${XPM_FILES} DESTINATION ${DATADIR}/fonts/feta/8)
+file(GLOB XPM_FILES pixmaps/feta/8/*.xpm)
+install(FILES ${XPM_FILES} DESTINATION ${DATADIR}/fonts/feta/8)
 
-FILE(GLOB XPM_FILES pixmaps/feta/10/*.xpm)
-INSTALL(FILES ${XPM_FILES} DESTINATION ${DATADIR}/fonts/feta/10)
+file(GLOB XPM_FILES pixmaps/feta/10/*.xpm)
+install(FILES ${XPM_FILES} DESTINATION ${DATADIR}/fonts/feta/10)
 
-FILE(GLOB XPM_FILES pixmaps/feta/12/*.xpm)
-INSTALL(FILES ${XPM_FILES} DESTINATION ${DATADIR}/fonts/feta/12)
+file(GLOB XPM_FILES pixmaps/feta/12/*.xpm)
+install(FILES ${XPM_FILES} DESTINATION ${DATADIR}/fonts/feta/12)
 
 # pixmaps
-FILE(GLOB PIXMAP_FILES pixmaps/misc/*.xpm pixmaps/misc/*.png)
-INSTALL(FILES ${PIXMAP_FILES} DESTINATION ${DATADIR}/pixmaps/misc)
+file(GLOB PIXMAP_FILES pixmaps/misc/*.xpm pixmaps/misc/*.png)
+install(FILES ${PIXMAP_FILES} DESTINATION ${DATADIR}/pixmaps/misc)
 
-FILE(GLOB PIXMAP_FILES pixmaps/toolbar/*.xpm pixmaps/toolbar/*.png)
-INSTALL(FILES ${PIXMAP_FILES} DESTINATION ${DATADIR}/pixmaps/toolbar)
+file(GLOB PIXMAP_FILES pixmaps/toolbar/*.xpm pixmaps/toolbar/*.png)
+install(FILES ${PIXMAP_FILES} DESTINATION ${DATADIR}/pixmaps/toolbar)
 
-FILE(GLOB PIXMAP_FILES pixmaps/transport/*.xpm pixmaps/transport/*.png)
-INSTALL(FILES ${PIXMAP_FILES} DESTINATION ${DATADIR}/pixmaps/transport)
+file(GLOB PIXMAP_FILES pixmaps/transport/*.xpm pixmaps/transport/*.png)
+install(FILES ${PIXMAP_FILES} DESTINATION ${DATADIR}/pixmaps/transport)
 
 # Splash
-INSTALL(FILES pixmaps/splash.png DESTINATION ${DATADIR}/pixmaps)
+install(FILES pixmaps/splash.png DESTINATION ${DATADIR}/pixmaps)
 
 # Examples
-SET(EXAMPLE_FILES
+set(EXAMPLE_FILES
     examples/aveverum.rg
     examples/aylindaamiga.rg
     examples/bogus-surf-jam.rg
@@ -114,12 +117,12 @@ SET(EXAMPLE_FILES
     examples/vivaldi-cs3mv2.rg
     examples/vivaldi_op44_11_1.rg )
 
-INSTALL(FILES ${EXAMPLE_FILES} DESTINATION ${DATADIR}/examples) 
-INSTALL(FILES examples/autoload.rg DESTINATION ${DATADIR})
+install(FILES ${EXAMPLE_FILES} DESTINATION ${DATADIR}/examples)
+install(FILES examples/autoload.rg DESTINATION ${DATADIR})
 
 # Library
-FILE(GLOB RGD_FILES library/*.rgd)
-INSTALL(FILES ${RGD_FILES} DESTINATION ${DATADIR}/library)
+file(GLOB RGD_FILES library/*.rgd)
+install(FILES ${RGD_FILES} DESTINATION ${DATADIR}/library)
 
 # KDE LIRC Profile
-INSTALL(FILES profile/rosegarden.profile.xml DESTINATION ${KDE3DATADIR}/profiles)
+install(FILES profile/rosegarden.profile.xml DESTINATION ${DATA_INSTALL_DIR}/profiles)

data/desktop/rosegarden.desktop

@@ -1,13 +1,16 @@
 [Desktop Entry]
+Name=Rosegarden
+
+GenericName=MIDI and Audio Sequencer and Editor
+
+Comment=MIDI and audio sequencer and musical notation editor
+
 Encoding=UTF-8
 Type=Application
-Categories=AudioVideo;Audio;Midi;Sequencer;X-SuSE-Sequencer;X-Red-Hat-Base;
 Exec=rosegarden
-MimeType=audio/x-rosegarden;audio/x-rosegarden-device;audio/midi
-X-KDE-NativeMimeType=audio/x-rosegarden
-Icon=rosegarden.png
-DocPath=rosegarden/index.html
-Comment=MIDI and Audio Sequencer and Editor
+Icon=rosegarden
 Terminal=false
-Name=Rosegarden
-Name[de]=Rosegarden
+Categories=AudioVideo;Audio;Midi;Sequencer;X-SuSE-Sequencer;X-Red-Hat-Base;
+MimeType=audio/x-rosegarden;audio/x-rosegarden-device;audio/midi
+X-DocPath=rosegarden/index.html
+X-TDE-NativeMimeType=audio/x-rosegarden

data/desktop/x-rosegarden-device.desktop

@@ -1,8 +1,8 @@
 [Desktop Entry]
 Comment=Rosegarden device file
-Comment[fr]=Fichier de description de peripherique Rosegarden
-Hidden=false
-Icon=midi
+
+Type=MimeType
 MimeType=audio/x-rosegarden-device
+Icon=audio-midi
 Patterns=*.rgd;*.RGD
-Type=MimeType
+Hidden=false

data/desktop/x-rosegarden.desktop

@@ -1,9 +1,9 @@
 [Desktop Entry]
 Comment=Rosegarden file
-Comment[fr]=Fichier Rosegarden
-Hidden=false
-Icon=x-rosegarden.png
+
+Type=MimeType
 MimeType=audio/x-rosegarden
+Icon=x-rosegarden
 Patterns=*.rg;*.RG
-Type=MimeType
-X-KDE-AutoEmbed=false
+Hidden=false
+X-TDE-AutoEmbed=false

data/desktop/x-rosegarden21.desktop

@@ -1,8 +1,8 @@
 [Desktop Entry]
 Comment=Rosegarden 2.1 file
-Comment[fr]=Fichier Rosegarden 2.1
-Hidden=false
-Icon=midi
+
+Type=MimeType
 MimeType=audio/x-rosegarden21
+Icon=audio-midi
 Patterns=*.rose
-Type=MimeType
+Hidden=false

data/desktop/x-soundfont.desktop

@@ -1,8 +1,8 @@
 [Desktop Entry]
 Comment=Soundfont
-Comment[fr]=Echantillons
-Hidden=false
-Icon=sound
+
+Type=MimeType
 MimeType=audio/x-soundfont
+Icon=audio-x-generic
 Patterns=*.sf2;*.SF2
-Type=MimeType
+Hidden=false

doc/en/index.docbook

@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.0//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY rosegarden "<application>Rosegarden</application>">
   <!ENTITY MIDI "<acronym>MIDI</acronym>">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
@@ -6773,7 +6773,7 @@
     <!-- For URL links to common stuff like the one below,
     always use paths like "common/gpl-licence".
     In this path, "common" will be a symbolic link built at "make install" time.
-    This link will normally point to $KDEDIR/share/doc/HTML/en/common,
+    This link will normally point to $TDEDIR/share/doc/tde/HTML/en/common,
     where "en" should be replaced with the current language. -->
 
     <para>

doc/es/index.docbook

@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.0//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY rosegarden "<application
 >Rosegarden</application
 >">
@@ -6322,7 +6322,7 @@ Changing the Time Signature
     <!-- For URL links to common stuff like the one below,
     always use paths like "common/gpl-licence".
     In this path, "common" will be a symbolic link built at "make install" time.
-    This link will normally point to $KDEDIR/share/doc/HTML/en/common,
+    This link will normally point to $TDEDIR/share/doc/tde/HTML/en/common,
     where "en" should be replaced with the current language. -->
 
     <para

doc/ja/index.docbook

@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.0//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY rosegarden "<application>Rosegarden</application>">
   <!ENTITY MIDI "<acronym>MIDI</acronym>">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
@@ -5362,7 +5362,7 @@
     <!-- For URL links to common stuff like the one below,
     always use paths like "common/gpl-licence".
     In this path, "common" will be a symbolic link built at "make install" time.
-    This link will normally point to $KDEDIR/share/doc/HTML/en/common,
+    This link will normally point to $TDEDIR/share/doc/tde/HTML/en/common,
     where "en" should be replaced with the current language. -->
 
     <para>

doc/man/rosegarden-audiofile-importer.1

@@ -0,0 +1,76 @@
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual; if not, write to the Free
+.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
+.\" USA.
+.\"
+.TH ROSEGARDEN-AUDIOFILE-IMPORTER 1 "19 March 2006"
+
+.SH NAME
+
+rosegarden-audiofile-importer - Helper application to convert and
+import audio files for Rosegarden.
+
+.SH SYNOPSIS
+
+rosegarden-audiofile-importer -t [<version>]
+rosegarden-audiofile-importer --conftest [<version>]
+rosegarden-audiofile-importer -l [<version>]
+rosegarden-audiofile-importer [-r <rate>] -w <inputfile>
+rosegarden-audiofile-importer [-r <rate>] -c <inputfile> <outputfile>
+
+
+.SH OPTIONS
+
+.BR -t " " [<version>], 
+.BR --conftest " " [<version>]
+
+Exit successfully if the importer is available and working [and is
+of at least version <version>].  If some of the required helper
+applications are missing, also print to stdout a line saying
+"Required: application1, application2", listing the missing
+programs.
+
+.BR \-l " " [<version>]
+
+List known file extensions (e.g. ogg wav flac).  Return code is same
+as for -t (so can combine two calls into one)
+
+.BR \-r " " <rate>
+
+Test whether any work is needed to convert the input, either because
+it isn't in a Rosegarden-compatible format or because its samplerate
+differs from <rate>.  Exit successfully if no work is required; return
+error code 2 if conversion required, 3 if resampling required, 4 if
+both required, 1 for other error.
+
+.SH DESCRIPTION
+
+Helper application to convert and import audio files for Rosegarden.
+
+Can take audio files of various kinds as input, always produces WAV
+files that are compatible with Rosegarden as output.
+
+Not actually specific to Rosegarden in any way, except that
+Rosegarden needs to know it can rely on its presence and calling
+interface.
+
+.SH SEE ALSO
+     rosegarden(1), rosegarden-lilypondview(1), rosegarden-project-page(1)
+
+
+

doc/man/rosegarden-lilypondview.1

@@ -0,0 +1,57 @@
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual; if not, write to the Free
+.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
+.\" USA.
+.\"
+.TH ROSEGARDEN-LILIPONDVIEW 1 "10 February 2006"
+i
+.SH NAME
+
+rosegardern-lilypondview - display a lilypond file in a postscript
+viewer.
+
+.SH SYNOPSIS
+
+rosegarden-lilypondview [-g] [FILE].ly
+
+.SH DESCRIPTION
+
+This script takes a Lilypond file as input.  It creates a temporary
+sandbox, runs Lilypond against the input file, then opens a PostScript
+viewer against the results in order to provide a graphical, printable
+preview.
+
+This script is used internally by Rosegarden, as the backend for the File -> 
+Export -> Preview Lilypond file feature.
+
+.SH OPTIONS
+.BR \-g " " Use graphical mode
+
+.SH REQUIREMENTS
+
+Working installation of Lilypond 2.0 or later KGhostView or KPDF or
+XPDF or GhostView or GS XDialog or Konsole or RXVT or Xterm [for
+graphical mode only]
+
+.SH AUTHOR
+Chris Cannam
+
+.SH COPYRIGHT
+2005-2006 Fervent Software.
+
+

doc/man/rosegarden-project-package.1

@@ -0,0 +1,76 @@
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual; if not, write to the Free
+.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
+.\" USA.
+.\"
+.TH ROSEGARDEN-PROJECT-PACKAGE 1 "10 February 2006"
+
+.SH NAME
+
+rosegarden-project-package - converts between Rosegarden (.rg) files
+and Rosegarden Project (.rgp) files.
+
+.SH SYNOPSIS
+
+orosegarden-project-package [--quiet] [--pack] [--unpack] [--conftest] [FILE] [.rg|.rgp]
+
+.SH OPTIONS
+.BR \-\-quiet " " Be silent
+.BR \-\-unpack " " Unpack .rgp file
+.BR \-\-pack " " Pack .rg file plus associated external data files into .rgp file
+.BR \-\-conftest " " Test environment for necessary installed components
+
+.SH DESCRIPTION
+
+This program converts between Rosegarden (.rg) files and Rosegarden
+Project (.rgp) files.  It is primarily intended to be used internally and 
+transparently by the Rosegarden application.
+
+A Rosegarden file (.rg) is a single file (in gzipped XML format)
+that defines a Rosegarden composition in terms of events, segments,
+programs, plugin data, references to audio files, and so on.  Some
+of these types of information depend on the presence of external
+files such as the audio files or plugin preset data, without which
+the file cannot be used.
+
+A Rosegarden Project (.rgp) file is a bundle of files, including the
+Rosegarden file itself, as well as any audio file or other external
+data it requires, in compressed form.  A Rosegarden Project file is
+intended to be portable and self-contained, but the Rosegarden
+program itself does not (at the time of writing) understand these
+files directly.
+
+This program can take a Rosegarden file, examine it to find out
+which other data files it uses, and pack it to create the
+corresponding Rosegarden Project file.  Conversely, it can also take
+a Rosegarden Project file and unpack it as a project directory for
+use with Rosegarden.
+
+.SH REQUIREMENTS
+
+Working installation of Lilypond 2.0 or later KGhostView or KPDF or
+XPDF or GhostView or GS XDialog or Konsole or RXVT or Xterm [for
+graphical mode only]
+
+.SH AUTHOR
+Chris Cannam
+
+.SH COPYRIGHT
+2005-2006 Fervent Software.
+
+

doc/man/rosegarden.1

@@ -0,0 +1,155 @@
+.TH ROSEGARDEN 1 "23 July 2006"
+
+.SH NAME
+
+rosegarden, rosegarden-sequencer - MIDI and audio sequencer and
+musical notation editor.
+
+.SH SYNOPSIS
+
+rosegarden [TQt-options] [TDE-options] [options] [File]
+
+rosegardensequencer [TQt-options] [TDE-options] [playback_1 playback_2 capture_1 capture_2]
+
+.SH DESCRIPTION
+
+This manual page documents briefly the rosegarden and rosegardensequencer commands.
+
+rosegarden is a MIDI and audio sequencer, notation editor, and general-purpose music composition and editing application for Unix and Linux. It is a TDE application, which means to build it you need the TDE libraries. However, once installed it can be run within the TDE environment or any other desktop or window manager environment.
+
+rosegardensequencer is part of the rosegarden application, the part which knows about and audio MIDI devices, and about real time. rosegardensequencer is executed automatically when rosegarden starts, so you will probably never need to execute it directly. You may want to specify command line options, though, to change the JACK ports used for audio capture and playback. In order to do that, you can invoque rosegardensequencer directly before running rosegarden, or you can specify the sequencer command line arguments using the rosegarden configuration dialog, and restarting the application. This program follows the usual GNU command line syntax, with long options starting with two dashes ('-'). A summary of options is included below.
+
+.SH OPTIONS
+.BR \-\-author " "
+     Show author information.
+
+.BR \-\-help " "
+     Show help about options.
+
+.BR \-\-help-all
+     Show all options.
+
+.BR \-\-help-tde
+     Show TDE specific options.
+
+.BR \-\-help-tqt
+     Show TQt specific options.
+
+.BR \-\-license 
+     Show license information.
+
+.BR \-v, \-\-version
+     Show version information.
+
+
+.SH OPTIONS for rosegarden
+
+.BR \-\-nosplash
+     Don\'t show splash screen.
+	
+
+.BR \-\-nosequencer
+     Don\'t use an external sequencer.
+
+.BR \-\-nofork
+     Don\'t automatically run in the background.
+
+.BR \ \--existingsequencer
+     Attach to a running sequencer process, if found.
+
+.BR File
+     File to load at startup. Typically a rosegarden (.rg) file, but it can also be a rosegarden2.1 file or a MIDI file.
+
+.SH OPTIONS
+.BR \-g " " Use graphical mode>
+     
+.SH TQt OPTIONS
+.BR \-\-bg, --background color
+     Sets the default background color and an application palette (light and dark shades are calculated).
+
+.BR \-\-btn, --button color
+     Sets the default button color.
+
+.BR \-\-cmap
+     Causes the application to install a private color map on an 8-bit display.
+
+.BR \-\-display displayname
+     Use the X-server display 'displayname'.
+
+.BR \-\-dograb
+     Running under a debugger can cause an implicit --nograb, use --dograb to override.
+
+.BR \-\-fg, \-\-foreground color
+     Sets the default foreground color.
+
+.BR \-\-fn, \-\-font fontname
+     Defines the application font.
+
+.BR \-\-im XIMserver
+     Set XIM server.
+
+.BR \-\-inputstyle inputstyle
+     Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root.
+
+.BR \-\-name name
+     Sets the application name.
+
+.BR \-\-ncols count
+     Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification.
+
+.BR \-\-nograb
+     Tells TQt to never grab the mouse or the keyboard.
+
+.BR \-\-noxim
+     Disable XIM.
+
+.BR \-\-reverse
+     Mirrors the whole layout of widgets.
+
+.BR \-\-session sessionId
+     Restore the application for the given 'sessionId'.
+
+.BR \-\-sync
+     Switches to synchronous mode for debugging.
+
+.BR \-\-title title
+     Sets the application title (caption).
+
+.BR \-\-visual TrueColor
+     Forces the application to use a TrueColor visual on an 8-bit display.
+
+
+.SH TDE OPTIONS
+.BR \-\-caption caption
+     Use 'caption' as name in the titlebar.
+
+.BR \-\-config filename
+     Use alternative configuration file.
+
+.BR \-\-dcopserver server
+     Use the DCOP Server specified by 'server'.
+
+.BR \-\-geometry geometry
+     Sets the client geometry of the main widget.
+
+.BR \-\-icon icon
+     Use 'icon' as the application icon.
+
+.BR \-\-miniicon icon
+     Use 'icon' as the icon in the titlebar.
+
+.BR \-\-nocrashhandler
+     Disable crash handler, to get core dumps.
+
+.BR \-\-style style
+     Sets the application GUI style.
+
+.BR \-\-waitforwm
+     Waits for a WM_NET compatible windowmanager.
+
+.SH SEE ALSO
+     jackd(1), rosegarden-lilypondview(1), rosegarden-project-package(1), rosegarden-audiofile-importer(1)
+
+
+.SH AUTHOR
+This manual page was written by Enrique Robledo Arnuncio <era@debian.org> and later ammended by Mike O'Connor <stew@vireo.org> for the Debian system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front Cover Texts and no Back Cover Texts.

doc/sv/index.docbook

@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.0//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY rosegarden "<application
 >Rosegarden</application
 >">
@@ -2691,7 +2691,7 @@
 >Anteckning</term
 ><listitem
 ><para
->Används för hjälptext som inte strikt anses tillhöra partituret. Visas normalt under notsystemet, i en gul ruta som liknar en klisterlapp. </para
+>Används för hjälptext som inte strikt anses tillhöra partituret. Visas normalt under notsystemet, i en gul ruta som liknar en tdelisterlapp. </para
 ></listitem
 ></varlistentry>
 
@@ -6391,7 +6391,7 @@ Changing the Time Signature
     <!-- For URL links to common stuff like the one below,
     always use paths like "common/gpl-licence".
     In this path, "common" will be a symbolic link built at "make install" time.
-    This link will normally point to $KDEDIR/share/doc/HTML/en/common,
+    This link will normally point to $TDEDIR/share/doc/tde/HTML/en/common,
     where "en" should be replaced with the current language. -->
 
     <para

doc/sv/rosegarden.po

@@ -114,8 +114,8 @@ msgstr "partitur"
 #. Tag: keyword
 #: index.docbook:256
 #, no-c-format
-msgid "<keyword>KDE</keyword>"
-msgstr "<keyword>KDE</keyword>"
+msgid "<keyword>TDE</keyword>"
+msgstr "<keyword>TDE</keyword>"
 
 #. Tag: title
 #: index.docbook:272 index.docbook:2458 index.docbook:3918
@@ -793,7 +793,7 @@ msgstr "Ljudfilhantering"
 #: index.docbook:688
 #, no-c-format
 msgid ""
-"You can drag-and-drop audio files from the KDE file browser or your KDE "
+"You can drag-and-drop audio files from the TDE file browser or your TDE "
 "desktop into the audio file manager, or you can open them using its File "
 "menu. Then you can either drag-and-drop them onto Rosegarden's track canvas, "
 "or use the audio file manager's <menuchoice><guimenu "
@@ -802,8 +802,8 @@ msgid ""
 "selected track in the main window is assigned to an audio instrument. "
 "Newly-recorded audio segments also appear in the audio file manager dialog."
 msgstr ""
-"Du kan dra och släppa ljudfiler från KDE:s filbläddrare eller "
-"KDE-skrivbordet till ljudfilhanteringen, eller öppna dem med dess "
+"Du kan dra och släppa ljudfiler från TDE:s filbläddrare eller "
+"TDE-skrivbordet till ljudfilhanteringen, eller öppna dem med dess "
 "arkivmeny. Därefter kan du antingen dra och släppa dem på Rosegardens "
 "spårduk, eller använda menyfunktionen <menuchoice><guimenu "
 "lang=\"sv\">Åtgärd</guimenu> <guimenuitem>Infoga i markerat "
@@ -4962,7 +4962,7 @@ msgid ""
 "default."
 msgstr ""
 "Används för hjälptext som inte strikt anses tillhöra partituret. Visas "
-"normalt under notsystemet, i en gul ruta som liknar en klisterlapp."
+"normalt under notsystemet, i en gul ruta som liknar en tdelisterlapp."
 
 #. Tag: para
 #: index.docbook:3166
@@ -6004,8 +6004,8 @@ msgid ""
 "(.ttf) or PostScript Type-1 (.pfb, .pfa) format, and you will need the "
 "relevant permissions to install them to the same place as &rosegarden; was "
 "installed. To install a supported notation font, locate the share directory "
-"for the &rosegarden; installation (usually a subdirectory of the KDE desktop "
-"installation tree, such as /opt/kde/share/apps/rosegarden). You will find "
+"for the &rosegarden; installation (usually a subdirectory of the TDE desktop "
+"installation tree, such as /opt/tde/share/apps/rosegarden). You will find "
 "that this directory has a subdirectory called \"fonts\": copy the font files "
 "into there, and restart &rosegarden;. If your font is supported, it should "
 "now appear on the font menu in the notation editor."
@@ -6016,8 +6016,8 @@ msgstr ""
 "ha lämpliga rättigheter för att installera dem på samma plats som "
 "&rosegarden; installerades. För att installera ett notteckensnitt "
 "som stöds, lokalisera katalogen share för &rosegarden;s installation "
-"(oftast en underkatalog till KDE-skrivbordets installationsträd, som "
-"/opt/kde/share/apps/rosegarden). Du märker att katalogen har en "
+"(oftast en underkatalog till TDE-skrivbordets installationsträd, som "
+"/opt/tde/share/apps/rosegarden). Du märker att katalogen har en "
 "underkatalog som heter \"fonts\". Kopiera teckensnittsfilerna till den, och "
 "starta om &rosegarden;. Om teckensnittet stöds, ska det nu synas i "
 "teckensnittsmenyn i notbehandlaren."

docs/CMakeLists.txt

@@ -1,4 +0,0 @@
-
-ADD_DOCS(rosegarden en es ja sv)
-
-INSTALL(FILES en/tips DESTINATION ${KDE3DATADIR}/rosegarden)

po/CMakeLists.txt

@@ -1,25 +0,0 @@
-
-# Automatic discovery of sources
-FILE(GLOB PO_FILES *.po)
-
-# DISABLED: explicit set of source files
-# SET(PO_FILES
-#    ca.po
-#    cs.po
-#    cy.po
-#    de.po
-#    en_GB.po
-#    en.po
-#    es.po
-#    et.po
-#    fi.po
-#    fr.po
-#    it.po
-#    ja.po
-#    nl.po
-#    ru.po
-#    sv.po
-#    zh_CN.po
-# )
-
-ADD_TRANSLATIONS(rosegarden ${PO_FILES})

po/messages.sh

@@ -1,101 +0,0 @@
-#!/bin/bash
-
-# Based on KDE messages.sh by Thomas Nagy
-# Inspired by Makefile.common from coolo
-# This script is used to update the .po files.
-
-# To update the translations, you will need a specific gettext 
-# patched for kde and a lot of patience, tenacity, luck, time ..
-
-# I guess one should only update the .po files when all .cpp files 
-# are generated (after a make or scons)
-
-if [ -z "$KDE_GETTEXT_BIN" ]; then
-    if [ -f ./xgettext ] && ./xgettext --help 2>&1 | grep -q extract; then
-	KDE_GETTEXT_BIN=.
-    elif [ -d /opt/gettext-kde/bin ]; then
-	KDE_GETTEXT_BIN=/opt/gettext-kde/bin
-    fi
-fi
-if [ ! -d "$KDE_GETTEXT_BIN" ]; then
-    echo 1>&2
-    echo "WARNING: Environment variable KDE_GETTEXT_BIN must be set" 1>&2
-    echo "such that the KDE patched version of gettext is found in " 1>&2
-    echo "KDE_GETTEXT_BIN/." 1>&2
-    echo 1>&2
-    echo "Falling back to default gettext, but plural translations " 1>&2
-    echo "will probably be wrong." 1>&2
-    echo 1>&2
-    echo "See ftp://ftp.kde.org/devel/gettext-kde/ for the patched gettext." 1>&2
-    echo 1>&2
-else
-    KDE_GETTEXT_PATH=${KDE_GETTEXT_BIN}/
-fi
-
-SRCDIR=../src # srcdir is the directory containing the source code
-TIPSDIR=../docs/en # tipsdir is the directory containing the tips
-DATADIR=../data # datadir is the directory containing fonts/mappings & styles
-
-KDEDIR=`kde-config --prefix`
-EXTRACTRC=extractrc # from kdesdk-scripts (on Debian Sarge)
-KDEPOT=$KDEDIR/include/kde.pot
-if [ ! -f "$KDEPOT" ] && [ -f /usr/include/kde/kde.pot ]; then
-    KDEPOT=/usr/include/kde/kde.pot
-fi
-XGETTEXT="${KDE_GETTEXT_PATH}xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x $KDEPOT "
-
-## check that kde.pot is available
-if ! test -e $KDEPOT; then
-	echo "$KDEPOT does not exist, there is something wrong with your installation!"
-	XGETTEXT="${KDE_GETTEXT_PATH}xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale "
-fi
-
-> rc.cpp
-
-## extract the strings
-echo "extracting the strings"
-
-# process the .ui and .rc files
-$EXTRACTRC `find $SRCDIR -iname *.rc` >> rc.cpp
-$EXTRACTRC `find $SRCDIR -iname *.ui` >> rc.cpp
-echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > $SRCDIR/_translatorinfo.cpp
-
-# process the tips - $SRCDIR is supposed to be where the tips are living
-pushd $TIPSDIR; preparetips >tips.cpp; popd
-
-# process the fonts mapping attributes
-FONTSDIR=$DATADIR/fonts/mappings
-pushd $FONTSDIR
-cat *.xml | perl -e 'while (<STDIN>) { if(/(encoding name|origin|copyright|mapped-by|type)\s*=\s*\"(.*)\"/) { print "i18n(\"$2\")\;\n";} }' > fonts.cpp
-popd
-
-# process the note head style names
-STYLEDIR=$DATADIR/styles
-pushd $STYLEDIR
-ls *.xml | perl -e 'while (<STDIN>) { if(/(.*)\.xml/) { print "i18n(\"$1\")\;\n";} }' > styles.cpp
-popd
-
-# extract the strings
-$XGETTEXT `find $SRCDIR \( -name "*.cpp" -o -name "*.h" \)` rc.cpp $TIPSDIR/tips.cpp $FONTSDIR/fonts.cpp $STYLEDIR/styles.cpp -o tmp.pot
-
-# remove the intermediate files
-rm -f $TIPSDIR/tips.cpp 
-rm -f $FONTSDIR/fonts.cpp 
-rm -f $STYLEDIR/styles.cpp
-rm -f rc.cpp
-rm -f $SRCDIR/_translatorinfo.cpp
-
-## now merge the .po files ..
-echo "merging the .po files"
-
-for i in `ls *.po`; do
-    echo $i
-    msgmerge $i tmp.pot -o $i || exit 1
-done
-
-# replacing the old template by the new one
-rm -f rosegarden.pot
-mv tmp.pot rosegarden.pot
-
-## finished
-echo "Done"

rosegarden.lsm

@@ -1,14 +0,0 @@
-Begin3
-Title:          Rosegarden-4
-Version:        1.2.3
-Entered-date:   
-Description:    MIDI and audio sequencer and musical notation editor
-Keywords:       KDE Qt JACK ALSA
-Author:         Guillaume Laurent <glaurent@telegraph-road.org>, Chris Cannam <cannam@all-day-breakfast.com>, Richard Bown <bownie@bownie.com>
-Maintained-by:  Guillaume Laurent <glaurent@telegraph-road.org>, Chris Cannam <cannam@all-day-breakfast.com>, Richard Bown <bownie@bownie.com>
-Home-page:      http://www.rosegardenmusic.com/
-Alternate-site: 
-Primary-site:   
-Platform:       Linux
-Copying-policy: GPL
-End

rosegarden.spec

@@ -1,209 +0,0 @@
-%define name    rosegarden
-%define version 1.7.0
-%define release 
-
-Summary:        Midi, audio and notation editor
-Name:           %name
-Version:        %version
-Release:        %release
-URL:            http://www.rosegardenmusic.com/
-Source0:        %name-1.7.0.tar.bz2
-License:        GPL
-Group:          Sound
-BuildRequires:  qt3-devel
-BuildRequires:  kdemultimedia-devel
-BuildRequires:  jackit-devel
-BuildRequires:  ladspa-devel
-BuildRequires:  dssi-devel
-BuildRequires:  liblrdf-devel
-BuildRequires:  libxml2-utils
-BuildRequires:  libfftw3-devel
-
-BuildRoot:      %{_tmppath}/%{name}-buildroot
-
-%description
-Rosegarden is an attractive, user-friendly MIDI and audio sequencer,
-notation editor, and general-purpose music composition and editing
-application for Unix and Linux
-
-%prep
-rm -rf $RPM_BUILD_ROOT
-%setup -q -n %{name}-1.7.0
-
-%build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
-%make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-%make DESTDIR=$RPM_BUILD_ROOT install
-
-#rm 0 byte fonts----why were they kept Lenny?
-rm -rf  `find $RPM_BUILD_ROOT -name accordion*.xpm`
-rm -rf  `find $RPM_BUILD_ROOT -name custodes*.xpm`
-
-#menu
-mkdir -p %{buildroot}%{_menudir}
-kdedesktop2mdkmenu.pl %{name} "Multimedia/Sound" $RPM_BUILD_ROOT%{_datadir}/applnk/Applications/rosegarden.desktop $RPM_BUILD_ROOT%{_menudir}/%{name}
-
-%find_lang %name
-
-%post
-%update_menus
-
-%postun
-%clean_menus
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -n %name -f %name.lang
-%defattr(-,root,root)
-%defattr(-, root,root)
-%doc AUTHORS COPYING Doxyfile INSTALL README TRANSLATORS
-%{_bindir}/*
-
-%{_datadir}/applnk/Applications/kde/rosegarden.desktop
-%{_datadir}/apps/%name
-%{_datadir}/apps/profiles
-
-%dir %_docdir/HTML/en/%name/
-%doc %_docdir/HTML/en/%name/*
-
-%dir %_docdir/HTML/ja/%name/
-%doc %_docdir/HTML/ja/%name/*.bz2
-%doc %_docdir/HTML/ja/%name/*.docbook
-
-%dir %_docdir/HTML/sv/%name/
-%doc %_docdir/HTML/sv/%name/*.bz2
-%doc %_docdir/HTML/sv/%name/*.docbook
-%doc %_docdir/HTML/sv/%name/*.png
-
-%doc %_docdir/HTML/es/%name/*.bz2
-%doc %_docdir/HTML/es/%name/*.docbook
-
-%{_datadir}/mimelnk/audio/*
-
-%_menudir/*
-
-%{_iconsdir}/hicolor/*/apps/*
-%{_iconsdir}/locolor/*/apps/*
-%{_iconsdir}/hicolor/16x16/mimetypes/x-rosegarden.png
-%{_iconsdir}/hicolor/32x32/mimetypes/x-rosegarden.png
-%{_iconsdir}/locolor/16x16/mimetypes/x-rosegarden.png
-%{_iconsdir}/locolor/32x32/mimetypes/x-rosegarden.png
-
-%changelog
-* Mon Dec 4 2006 Pedro Lopez-Cabanillas <plcl@users.sf.net> 1.5.0
-- Using CMake
-
-* Mon Sep 25 2006 Pedro Lopez-Cabanillas <plcl@users.sf.net> 1.4.0-1mdk
-- 1.4.0
-
-* Fri Jul 14 2006 Pedro Lopez-Cabanillas <plcl@users.sf.net> 1.2.4-1mdk
-- New release
-- Include DSSI support
-- Use the internal scons-mini to avoid broken SCons versions
-
-* Sun Feb 19 2006 Christiaan Welvaart <cjw@daneel.dyndns.org> 1.2.3-1mdk
-- 1.2.3
-- drop patches 1,2,3,4 - don't apply + not needed
-- scons...
-- no shared libraries built, drop lib packages
-
-* Wed Aug 24 2005 Gwenole Beauchesne <gbeauchesne@mandriva.com> 1.0-5mdk
-- harmless 64-bit fixes
-
-* Sat Aug 20 2005 Christiaan Welvaart <cjw@daneel.dyndns.org> 1.0-4mdk
-- patch3: fix build (for gcc 4.0?)
-
-* Mon Jun 13 2005 Pascal Terjan <pterjan@mandriva.org> 1.0-3mdk
-- fix build with gcc4 (patch2)
-
-* Mon Mar 21 2005 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 1.0-2mdk
-- fix build on lib64 platforms
-
-* Tue Feb 15 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 1.0-1mdk
-- 1.0
-
-* Mon Dec 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.9.91-1mdk
-- 0.9.91
-
-* Tue Oct 19 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 0.9.9-2mdk
-- -Wmissing-prototypes is only valid for the C front-end
-
-* Tue Aug 17 2004 Pascal Terjan <pterjan@mandrake.org> 0.9.9-1mdk
-- 0.9.9
-- update patch0
-
-* Fri Jul 16 2004 Michael Scherer <misc@mandrake.org> 0.9.8-2mdk
-- rebuild for new gcc ( patch 0 )
-
-* Tue May 26 2004 Austin Acton <austin@mandrake.org> 0.9.8-1mdk
-- 0.9.8
-
-* Tue Apr 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.9.7-2mdk
-- Fix menu
-
-* Thu Apr 1 2004 Austin Acton <austin@mandrake.org> 0.9.7-1mdk
-- 0.9.7
-
-* Tue Feb 17 2004 Austin Acton <austin@mandrake.org> 0.9.6-4mdk
-- rebuild for liblrdf2
-
-* Wed Jan 14 2004 Charles A Edwards <eslrahc@mandrake.org> 0.9.6-3mdk
-- put back correct changelog entry for Austin's 0.9.6-1mdk--don't
-  know how I screwed that
-
-* Wed Jan 14 2004 Charles A Edwards <eslrahc@mandrake.org> 0.9.6-2mdk
-- use libtoolize /bin/true
-- define iconname
-- build with liblrdf
-- buildrequire liblrdf0-devel and ImageMagick
-- use source xpm to create icons
-- fix rpath for _libdir  and _bindir
-- use marcos configure2_5x and makeinstall_std
-- rm 0 byte fonts
-- add docand doc/howtos
-
-* Mon Jan 12 2004 Austin Acton <austin@mandrake.org> 0.9.6-1mdk
-- 0.9.6
-- does not require "jack" or libname
-- buildrequires jackit and ladspa libs
-- mklibname
-- lib64 fix buildrequires
-
-* Thu Dec 04 2003 Lenny Cartier <lenny@mandrakesoft.com> 0.9.5-1mdk
-- 0.9.5
-
-* Thu Jun 5 2003 Austin Acton <aacton@yorku.ca> 0.9.1-1mdk
-- 0.9.1
-- pretty-up spec
-- tie bin and lib package versions
-
-* Sun May 11 2003 Laurent Culioli <laurent@pschit.net> 0.9-1mdk
-- 0.9
-- frop patch0
-
-* Tue May 06 2003 Lenny Cartier <lenny@mandrakesoft.com> 0.8.5-2mdk
-- buildrequires
-
-* Fri Dec 20 2002 Lenny Cartier <lenny@mandrakesoft.com> 0.8.5-1mdk
-- add mandrake menu
-- add libraries rpm
-- keep zero length xpm icons...
-- from ccrma package
-
-* Wed Dec 18 2002 Fernando Lopez Lezcano <nando@ccrma.stanford.edu> 0.8.5-1
-- changed name to rosegarden, anaconda does not like the current name
-  (anaconda should be fixed, name is legal)
-- update to 0.8.5
-
-* Sun Nov 10 2002 Fernando Lopez Lezcano <nando@ccrma.stanford.edu> 0.8-2
-- changed name of package to rosegarden-4 (what was I thinking?...)
-- added patch to rename jack alsa ports for jack >= 0.40
-- added explicit dependency to jack
-- added redhat menu entry
-
-* Fri Oct 18 2002 Fernando Lopez Lezcano <nando@ccrma.stanford.edu>
-- Initial build.

rosegarden.spec.in

@@ -1,209 +0,0 @@
-%define name    rosegarden
-%define version @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
-%define release @VERSION_SUFFIX@
-
-Summary:        Midi, audio and notation editor
-Name:           %name
-Version:        %version
-Release:        %release
-URL:            http://www.rosegardenmusic.com/
-Source0:        %name-@VERSION@.tar.bz2
-License:        GPL
-Group:          Sound
-BuildRequires:  qt3-devel
-BuildRequires:  kdemultimedia-devel
-BuildRequires:  jackit-devel
-BuildRequires:  ladspa-devel
-BuildRequires:  dssi-devel
-BuildRequires:  liblrdf-devel
-BuildRequires:  libxml2-utils
-BuildRequires:  libfftw3-devel
-
-BuildRoot:      %{_tmppath}/%{name}-buildroot
-
-%description
-Rosegarden is an attractive, user-friendly MIDI and audio sequencer,
-notation editor, and general-purpose music composition and editing
-application for Unix and Linux
-
-%prep
-rm -rf $RPM_BUILD_ROOT
-%setup -q -n %{name}-@VERSION@
-
-%build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
-%make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-%make DESTDIR=$RPM_BUILD_ROOT install
-
-#rm 0 byte fonts----why were they kept Lenny?
-rm -rf  `find $RPM_BUILD_ROOT -name accordion*.xpm`
-rm -rf  `find $RPM_BUILD_ROOT -name custodes*.xpm`
-
-#menu
-mkdir -p %{buildroot}%{_menudir}
-kdedesktop2mdkmenu.pl %{name} "Multimedia/Sound" $RPM_BUILD_ROOT%{_datadir}/applnk/Applications/rosegarden.desktop $RPM_BUILD_ROOT%{_menudir}/%{name}
-
-%find_lang %name
-
-%post
-%update_menus
-
-%postun
-%clean_menus
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -n %name -f %name.lang
-%defattr(-,root,root)
-%defattr(-, root,root)
-%doc AUTHORS COPYING Doxyfile INSTALL README TRANSLATORS
-%{_bindir}/*
-
-%{_datadir}/applnk/Applications/kde/rosegarden.desktop
-%{_datadir}/apps/%name
-%{_datadir}/apps/profiles
-
-%dir %_docdir/HTML/en/%name/
-%doc %_docdir/HTML/en/%name/*
-
-%dir %_docdir/HTML/ja/%name/
-%doc %_docdir/HTML/ja/%name/*.bz2
-%doc %_docdir/HTML/ja/%name/*.docbook
-
-%dir %_docdir/HTML/sv/%name/
-%doc %_docdir/HTML/sv/%name/*.bz2
-%doc %_docdir/HTML/sv/%name/*.docbook
-%doc %_docdir/HTML/sv/%name/*.png
-
-%doc %_docdir/HTML/es/%name/*.bz2
-%doc %_docdir/HTML/es/%name/*.docbook
-
-%{_datadir}/mimelnk/audio/*
-
-%_menudir/*
-
-%{_iconsdir}/hicolor/*/apps/*
-%{_iconsdir}/locolor/*/apps/*
-%{_iconsdir}/hicolor/16x16/mimetypes/x-rosegarden.png
-%{_iconsdir}/hicolor/32x32/mimetypes/x-rosegarden.png
-%{_iconsdir}/locolor/16x16/mimetypes/x-rosegarden.png
-%{_iconsdir}/locolor/32x32/mimetypes/x-rosegarden.png
-
-%changelog
-* Mon Dec 4 2006 Pedro Lopez-Cabanillas <plcl@users.sf.net> 1.5.0
-- Using CMake
-
-* Mon Sep 25 2006 Pedro Lopez-Cabanillas <plcl@users.sf.net> 1.4.0-1mdk
-- 1.4.0
-
-* Fri Jul 14 2006 Pedro Lopez-Cabanillas <plcl@users.sf.net> 1.2.4-1mdk
-- New release
-- Include DSSI support
-- Use the internal scons-mini to avoid broken SCons versions
-
-* Sun Feb 19 2006 Christiaan Welvaart <cjw@daneel.dyndns.org> 1.2.3-1mdk
-- 1.2.3
-- drop patches 1,2,3,4 - don't apply + not needed
-- scons...
-- no shared libraries built, drop lib packages
-
-* Wed Aug 24 2005 Gwenole Beauchesne <gbeauchesne@mandriva.com> 1.0-5mdk
-- harmless 64-bit fixes
-
-* Sat Aug 20 2005 Christiaan Welvaart <cjw@daneel.dyndns.org> 1.0-4mdk
-- patch3: fix build (for gcc 4.0?)
-
-* Mon Jun 13 2005 Pascal Terjan <pterjan@mandriva.org> 1.0-3mdk
-- fix build with gcc4 (patch2)
-
-* Mon Mar 21 2005 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 1.0-2mdk
-- fix build on lib64 platforms
-
-* Tue Feb 15 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 1.0-1mdk
-- 1.0
-
-* Mon Dec 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.9.91-1mdk
-- 0.9.91
-
-* Tue Oct 19 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 0.9.9-2mdk
-- -Wmissing-prototypes is only valid for the C front-end
-
-* Tue Aug 17 2004 Pascal Terjan <pterjan@mandrake.org> 0.9.9-1mdk
-- 0.9.9
-- update patch0
-
-* Fri Jul 16 2004 Michael Scherer <misc@mandrake.org> 0.9.8-2mdk
-- rebuild for new gcc ( patch 0 )
-
-* Tue May 26 2004 Austin Acton <austin@mandrake.org> 0.9.8-1mdk
-- 0.9.8
-
-* Tue Apr 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.9.7-2mdk
-- Fix menu
-
-* Thu Apr 1 2004 Austin Acton <austin@mandrake.org> 0.9.7-1mdk
-- 0.9.7
-
-* Tue Feb 17 2004 Austin Acton <austin@mandrake.org> 0.9.6-4mdk
-- rebuild for liblrdf2
-
-* Wed Jan 14 2004 Charles A Edwards <eslrahc@mandrake.org> 0.9.6-3mdk
-- put back correct changelog entry for Austin's 0.9.6-1mdk--don't
-  know how I screwed that
-
-* Wed Jan 14 2004 Charles A Edwards <eslrahc@mandrake.org> 0.9.6-2mdk
-- use libtoolize /bin/true
-- define iconname
-- build with liblrdf
-- buildrequire liblrdf0-devel and ImageMagick
-- use source xpm to create icons
-- fix rpath for _libdir  and _bindir
-- use marcos configure2_5x and makeinstall_std
-- rm 0 byte fonts
-- add docand doc/howtos
-
-* Mon Jan 12 2004 Austin Acton <austin@mandrake.org> 0.9.6-1mdk
-- 0.9.6
-- does not require "jack" or libname
-- buildrequires jackit and ladspa libs
-- mklibname
-- lib64 fix buildrequires
-
-* Thu Dec 04 2003 Lenny Cartier <lenny@mandrakesoft.com> 0.9.5-1mdk
-- 0.9.5
-
-* Thu Jun 5 2003 Austin Acton <aacton@yorku.ca> 0.9.1-1mdk
-- 0.9.1
-- pretty-up spec
-- tie bin and lib package versions
-
-* Sun May 11 2003 Laurent Culioli <laurent@pschit.net> 0.9-1mdk
-- 0.9
-- frop patch0
-
-* Tue May 06 2003 Lenny Cartier <lenny@mandrakesoft.com> 0.8.5-2mdk
-- buildrequires
-
-* Fri Dec 20 2002 Lenny Cartier <lenny@mandrakesoft.com> 0.8.5-1mdk
-- add mandrake menu
-- add libraries rpm
-- keep zero length xpm icons...
-- from ccrma package
-
-* Wed Dec 18 2002 Fernando Lopez Lezcano <nando@ccrma.stanford.edu> 0.8.5-1
-- changed name to rosegarden, anaconda does not like the current name
-  (anaconda should be fixed, name is legal)
-- update to 0.8.5
-
-* Sun Nov 10 2002 Fernando Lopez Lezcano <nando@ccrma.stanford.edu> 0.8-2
-- changed name of package to rosegarden-4 (what was I thinking?...)
-- added patch to rename jack alsa ports for jack >= 0.40
-- added explicit dependency to jack
-- added redhat menu entry
-
-* Fri Oct 18 2002 Fernando Lopez Lezcano <nando@ccrma.stanford.edu>
-- Initial build.

src/CMakeLists.txt

@@ -1,221 +1,161 @@
-IF(NOT ROSEGARDEN_SOURCE_DIR)
-    MESSAGE(FATAL_ERROR "You need to run cmake or ccmake at the root directory")
-ENDIF(NOT ROSEGARDEN_SOURCE_DIR)
-
-IF(USE_PCH)
-    ADD_PRECOMPILED_HEADER(precompiled_headers misc/stableheaders.h)
-ENDIF(USE_PCH)
-
-LINK_DIRECTORIES(
-    ${KDE3_LIB_DIR} 
-    ${ALSA_LIB_DIR}
-    ${JACK_LIB_DIR}
-    ${XFT_LIB_DIR}
-    ${LIBLO_LIB_DIR}
-    ${LRDF_LIB_DIR}
-    ${LIRC_LIB_DIR}
-    ${FFTW3F_LIB_DIR}    
+#################################################
+#
+#  (C) 2011 Timothy Pearson
+#  kb9vqf (AT) pearsoncomputing.net
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+  ${TQT_INCLUDE_DIRS}
+  ${TDE_INCLUDE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/src
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_SOURCE_DIR}/src/base
+  ${ALSA_INC_DIR}
+  ${JACK_INC_DIR}
+  ${XFT_INC_DIR}
+  ${DSSI_INC_DIR}
+  ${LIBLO_INC_DIR}
+  ${LADSPA_INC_DIR}
+  ${LRDF_INC_DIR}
+  ${LIRC_INC_DIR}
+  ${FFTW3F_INC_DIR}
 )
 
-INCLUDE_DIRECTORIES(AFTER
-    ${QT_INCLUDE_DIR} 
-    ${KDE3_INCLUDE_DIR} 
-    ${ALSA_INC_DIR}
-    ${JACK_INC_DIR}
-    ${XFT_INC_DIR}
-    ${DSSI_INC_DIR}
-    ${LIBLO_INC_DIR}
-    ${LADSPA_INC_DIR}
-    ${LRDF_INC_DIR}
-    ${LIRC_INC_DIR}
-    ${FFTW3F_INC_DIR}
-    base
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIBRARY_DIR}
+  ${ALSA_LIB_DIR}
+  ${JACK_LIB_DIR}
+  ${XFT_LIB_DIR}
+  ${LIBLO_LIB_DIR}
+  ${LRDF_LIB_DIR}
+  ${LIRC_LIB_DIR}
+  ${FFTW3F_LIB_DIR}
+  ${CMAKE_BINARY_DIR}/src
 )
 
-SET(CMAKE_INCLUDE_PATH ".")
+##### include cmake file lists ##################
+
+set( CMAKE_INCLUDE_PATH "." )
 
 # Common sources
-INCLUDE(BaseFileList.txt)
-INCLUDE(MiscFileList.txt)
+include( BaseFileList.txt )
+include( MiscFileList.txt )
 
 # Sound sources
-INCLUDE(SoundFileList.txt)
+include( SoundFileList.txt )
 
-KDE3_AUTOMOC(${common_sound_SRCS})
+# sequencer executable
+include( SequencerFileList.txt )
 
-ADD_LIBRARY(RosegardenCommon STATIC
-    ${misc_SRCS}
-    ${base_SRCS}
-    ${common_sound_SRCS}
-)
+# gui executable
+include( GUIFileList.txt )
 
-TARGET_LINK_LIBRARIES(RosegardenCommon
-    dl
-)
+##### other data ################################
 
-IF(USE_PCH)
-    ADD_DEPENDENCIES(RosegardenCommon precompiled_headers)
-ENDIF(USE_PCH)
+# Install helper scripts
+install( PROGRAMS
+    helpers/rosegarden-lilypondview
+    helpers/rosegarden-project-package
+    helpers/rosegarden-audiofile-importer
+  DESTINATION ${BIN_INSTALL_DIR} )
 
-# sequencer executable
-INCLUDE(SequencerFileList.txt)
+# Install GUI resource files
+file( GLOB RC_FILES gui/ui/*.rc )
+install( FILES ${RC_FILES} DESTINATION ${DATA_INSTALL_DIR}/rosegarden )
 
-IF(WANT_SOUND)
-    SET(snd_SRCS ${sound_SRCS})
-ELSE(WANT_SOUND)
-    SET(snd_SRCS ${nosnd_SRCS})
-ENDIF(WANT_SOUND)
 
-KDE3_ADD_DCOP_SKELS(sequencer_SRCS ${seq_dcop_SRCS})
-KDE3_ADD_DCOP_STUBS(sequencer_SRCS ${seq_dcop_SRCS}) 
-KDE3_AUTOMOC(${sequencer_SRCS})
+##### RosegardenCommon ##############################
 
-KDE3_ADD_EXECUTABLE(rosegardensequencer 
-    ${snd_SRCS}
-    ${sequencer_SRCS}
+tde_add_library( RosegardenCommon STATIC AUTOMOC
+  SOURCES ${misc_SRCS} ${base_SRCS} ${common_sound_SRCS}
+  LINK ${CMAKE_DL_LIBS} ${FFTW3F_LIBS} ${LRDF_LIBS}
+  DESTINATION ${LIB_INSTALL_DIR}
 )
 
-IF(USE_PCH)
-    ADD_DEPENDENCIES(rosegardensequencer precompiled_headers)
-ENDIF(USE_PCH)
-
-TARGET_LINK_LIBRARIES(rosegardensequencer 
-    dl
-    ${QT_AND_KDECORE_LIBS} 
-    ${ALSA_LIBS} 
-    ${JACK_LIBS}
-    ${LIBLO_LIBS}
-    ${LRDF_LIBS}
-    ${FFTW3F_LIBS}
-    kdeui
-    RosegardenCommon
-)
 
-# gui executable
-INCLUDE(GUIFileList.txt)
-
-KDE3_ADD_DCOP_SKELS(gui_SRCS ${gui_dcop_SRCS})
-KDE3_ADD_DCOP_STUBS(gui_SRCS ${gui_dcop_SRCS}) 
-KDE3_ADD_UI_FILES(gui_SRCS ${ui_SRCS})
-KDE3_AUTOMOC(${gui_SRCS})
-KDE3_AUTOMOC(${segmentcanvas_SRCS})
-KDE3_AUTOMOC(${commands_SRCS})
-KDE3_AUTOMOC(${document_SRCS})
-
-ADD_LIBRARY(RosegardenExtended STATIC
-    ${document_SRCS}
-    ${gui_SRCS}
-)
+##### rosegardensequencer ###########################
 
-TARGET_LINK_LIBRARIES(RosegardenExtended
-    dl
-    lo
-)
+if( WANT_SOUND )
+  set( snd_SRCS ${sound_SRCS} )
+else( WANT_SOUND )
+  set( snd_SRCS ${nosnd_SRCS} )
+endif( WANT_SOUND )
 
-ADD_LIBRARY(RosegardenCommands STATIC
-    ${commands_SRCS}
+tde_add_executable( rosegardensequencer AUTOMOC
+  SOURCES ${seq_dcop_SRCS} ${snd_SRCS} ${sequencer_SRCS}
+  LINK
+    ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT} tdecore-shared ${ALSA_LIBS} ${JACK_LIBS}
+    ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} tdeui-shared RosegardenCommon-static
+  DESTINATION ${BIN_INSTALL_DIR}
 )
 
-IF(USE_PCH)
-    ADD_DEPENDENCIES(RosegardenExtended precompiled_headers)
-ENDIF(USE_PCH)
 
-IF(USE_PCH)
-    ADD_DEPENDENCIES(RosegardenCommands precompiled_headers)
-ENDIF(USE_PCH)
+##### RosegardenExtended ############################
 
-ADD_LIBRARY(RosegardenSegmentCanvas STATIC
-    ${segmentcanvas_SRCS}
+tde_add_library( RosegardenExtended STATIC AUTOMOC
+  SOURCES ${document_SRCS} ${gui_SRCS} ${gui_dcop_SRCS} ${ui_SRCS}
+  LINK
+    ${CMAKE_DL_LIBS} ${LIBLO_LIBS} ${JACK_LIBS} ${LIRC_LIBS} ${XFT_LIBRARIES}
+    fontconfig tdeprint-shared
+  DESTINATION ${LIB_INSTALL_DIR}
 )
 
-IF(USE_PCH)
-    ADD_DEPENDENCIES(RosegardenSegmentCanvas precompiled_headers)
-ENDIF(USE_PCH)
-
 
+##### RosegardenCommands ############################
 
-KDE3_ADD_EXECUTABLE(rosegarden 
-    #${commands_SRCS}
-    #${document_SRCS}
-    #${gui_SRCS}
-    #${segmentcanvas_SRCS}
-    gui/application/main.cpp
+tde_add_library( RosegardenCommands STATIC AUTOMOC
+  SOURCES ${commands_SRCS}
+  DESTINATION ${LIB_INSTALL_DIR}
 )
 
-IF(USE_PCH)
-    ADD_DEPENDENCIES(rosegarden precompiled_headers)
-ENDIF(USE_PCH)
-
-TARGET_LINK_LIBRARIES(rosegarden
-    dl
-    lo
-    ${QT_AND_KDECORE_LIBS} 
-    ${LIBLO_LIBS}
-    ${LRDF_LIBS}
-    ${FFTW3F_LIBS}
-    ${XFT_LIBS}
-    ${LIRC_LIBS}
-    ${JACK_LIBS}
-    kio
-    kdeui
-    kdeprint
-    RosegardenExtended
-    RosegardenSegmentCanvas
-    RosegardenCommands
-    RosegardenCommon
+
+##### RosegardenSegmentCanvas #######################
+
+tde_add_library( RosegardenSegmentCanvas STATIC AUTOMOC
+  SOURCES ${segmentcanvas_SRCS}
+  DESTINATION ${LIB_INSTALL_DIR}
 )
 
-# Install targets
-INSTALL(TARGETS rosegarden rosegardensequencer
-        RUNTIME DESTINATION ${KDE3EXECDIR} )
 
-# Install helper scripts
-INSTALL(PROGRAMS
-            helpers/rosegarden-lilypondview
-            helpers/rosegarden-project-package
-            helpers/rosegarden-audiofile-importer
-        DESTINATION ${KDE3EXECDIR} )
+##### rosegarden ####################################
 
-# Install GUI resource files
-FILE(GLOB RC_FILES gui/ui/*.rc)
-INSTALL(FILES ${RC_FILES}
-        DESTINATION ${KDE3DATADIR}/rosegarden )
-
-IF(WANT_TEST)
-    INCLUDE(TestFileList.txt)
-
-    CREATE_TEST_SOURCELIST(RosegardenTest
-    	RosegardenTestDriver.cpp
-        ${tests_SRCS}
-#        base/test/transpose.cpp
-#        base/test/segmenttransposecommand.cpp
-    )
-
-    KDE3_ADD_EXECUTABLE(RosegardenTestDriver
-        RosegardenTestDriver.cpp
-        ${tests_SRCS}
-    )
-
-    TARGET_LINK_LIBRARIES(RosegardenTestDriver
-        dl
-        ${QT_AND_KDECORE_LIBS} 
-        ${LIBLO_LIBS}
-        ${LRDF_LIBS}
-        ${FFTW3F_LIBS}
-        ${XFT_LIBS}
-        ${LIRC_LIBS}
-        ${JACK_LIBS}
-        kio
-        kdeui
-        kdeprint
-        RosegardenExtended
-        RosegardenSegmentCanvas
-        RosegardenCommands
-        RosegardenCommon
-    )
-    FOREACH(currenttest ${tests_SRCS})
-        GET_FILENAME_COMPONENT(TestName ${currenttest} NAME_WE)
-        ADD_TEST(test/${TestName} RosegardenTestDriver test/${TestName})
-    ENDFOREACH(currenttest ${tests_SRCS})
-ENDIF(WANT_TEST)
+tde_add_executable( rosegarden AUTOMOC
+  SOURCES gui/application/main.cpp
+  LINK
+    ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT} tdecore-shared tdeio-shared tdeui-shared
+    RosegardenExtended-static RosegardenSegmentCanvas-static RosegardenCommands-static
+    RosegardenCommon-static
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+if( WANT_TEST )
+  include( TestFileList.txt )
+
+  create_test_sourcelist(RosegardenTest
+    RosegardenTestDriver.cpp
+    ${tests_SRCS}
+#    base/test/transpose.cpp
+#    base/test/segmenttransposecommand.cpp
+  )
+
+  tde_add_executable( RosegardenTestDriver AUTOMOC
+    SOURCES RosegardenTestDriver.cpp ${tests_SRCS}
+    LINK
+      ${CMAKE_DL_LIBS} tdecore-shared tdeio-shared tdeui-shared RosegardenExtended-static
+      RosegardenSegmentCanvas-static RosegardenCommands-static RosegardenCommon-static
+    DESTINATION ${BIN_INSTALL_DIR}
+  )
+
+  foreach(currenttest ${tests_SRCS})
+    get_filename_component(TestName ${currenttest} NAME_WE)
+    add_test(test/${TestName} RosegardenTestDriver test/${TestName})
+  endforeach(currenttest ${tests_SRCS})
+endif( WANT_TEST )
 

src/GUIFileList.txt

@@ -2,8 +2,8 @@
 # find commands/ document/ gui/ -iname '*.cpp' -or -iname '*.h' > list.txt
 
 SET(gui_dcop_SRCS
-	gui/application/RosegardenIface.h 
-	gui/editors/segment/TrackEditorIface.h
+	gui/application/RosegardenIface.skel
+	gui/editors/segment/TrackEditorIface.skel
 )
 
 SET(ui_SRCS 
@@ -728,8 +728,8 @@ SET(gui_SRCS
 	gui/general/StaffLine.h
 	gui/kdeext/KLedButton.cpp
 	gui/kdeext/KLedButton.h
-	gui/kdeext/KStartupLogo.cpp
-	gui/kdeext/KStartupLogo.h
+	gui/kdeext/TDEStartupLogo.cpp
+	gui/kdeext/TDEStartupLogo.h
 	gui/kdeext/KTmpStatusMsg.cpp
 	gui/kdeext/KTmpStatusMsg.h
 	gui/kdeext/QCanvasGroupableItem.cpp

src/SequencerFileList.txt

@@ -13,5 +13,5 @@ SET(sequencer_SRCS
 )
 
 SET(seq_dcop_SRCS
-	sequencer/RosegardenSequencerIface.h
+	sequencer/RosegardenSequencerIface.skel
 )

src/base/AnalysisTypes.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/AnalysisTypes.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -29,6 +27,7 @@
 #include <map>
 #include <set>
 #include <vector>
+#include <functional>
 
 #include "NotationTypes.h"
 
@@ -159,7 +158,7 @@ protected:
     typedef std::pair<double, ChordLabel> ChordPossibility;
     typedef std::vector<ChordPossibility> HarmonyGuess;
     typedef std::vector<std::pair<timeT, HarmonyGuess> > HarmonyGuessList;
-    struct cp_less : public std::binary_function<ChordPossibility, ChordPossibility, bool>
+    struct cp_less : public std::function<bool(ChordPossibility, ChordPossibility)>
     {
         bool operator()(ChordPossibility l, ChordPossibility r);
     };

src/base/AudioDevice.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -23,14 +21,7 @@
 #include "Instrument.h"
 
 #include <cstdio>
-
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
 
 
 namespace Rosegarden

src/base/AudioDevice.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/AudioLevel.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/AudioLevel.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/AudioPluginInstance.cpp

@@ -1,4 +1,3 @@
-// -*- c-basic-offset: 4 -*-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -23,13 +22,7 @@
 
 #include <iostream>
 #include <cstring>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
 
 namespace Rosegarden
 {

src/base/AudioPluginInstance.h

@@ -1,4 +1,3 @@
-// -*- c-indentation-style:"stroustrup" c-basic-offset: 4 -*-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/BaseProperties.cpp

@@ -19,13 +19,7 @@
 
 #include "BaseProperties.h"
 #include <vector>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
 
 namespace Rosegarden
 {
@@ -115,7 +109,7 @@ const PropertyName TRIGGER_SEGMENT_RETUNE        = "triggersegmentretune";
 const PropertyName TRIGGER_SEGMENT_ADJUST_TIMES  = "triggersegmentadjusttimes";
 
 const std::string TRIGGER_SEGMENT_ADJUST_NONE = "none";
-const std::string TRIGGER_SEGMENT_ADJUST_STQUISH = "squish";
+const std::string TRIGGER_SEGMENT_ADJUST_SQUISH = "squish";
 const std::string TRIGGER_SEGMENT_ADJUST_SYNC_START = "syncstart";
 const std::string TRIGGER_SEGMENT_ADJUST_SYNC_END = "syncend";
 

src/base/BaseProperties.h

@@ -62,7 +62,7 @@ extern const PropertyName TRIGGER_SEGMENT_RETUNE;
 extern const PropertyName TRIGGER_SEGMENT_ADJUST_TIMES;
 
 extern const std::string TRIGGER_SEGMENT_ADJUST_NONE;
-extern const std::string TRIGGER_SEGMENT_ADJUST_STQUISH;
+extern const std::string TRIGGER_SEGMENT_ADJUST_SQUISH;
 extern const std::string TRIGGER_SEGMENT_ADJUST_SYNC_START;
 extern const std::string TRIGGER_SEGMENT_ADJUST_SYNC_END;
 

src/base/BasicQuantizer.cpp

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/BasicQuantizer.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -19,8 +17,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef BASIC_TQUANTIZER_H
-#define BASIC_TQUANTIZER_H
+#ifndef BASIC_QUANTIZER_H
+#define BASIC_QUANTIZER_H
 
 #include "Quantizer.h"
 

src/base/Clipboard.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Clipboard.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Colour.cpp

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -24,13 +21,7 @@
 */
 
 #include "Colour.h"
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
 
 namespace Rosegarden 
 {

src/base/Colour.h

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/ColourMap.cpp

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -24,13 +21,7 @@
 */
 
 #include <string>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
 
 #include "ColourMap.h"
 #include "XmlExportable.h"

src/base/ColourMap.h

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Composition.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -32,13 +30,7 @@
 #include <algorithm>
 #include <cmath>
 #include <typeinfo>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
 
 using std::cerr;
 using std::endl;

src/base/Composition.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -770,7 +768,7 @@ public:
 
     //////
     //
-    // TQUANTIZERS
+    // QUANTIZERS
 
     /**
      * Return a quantizer that quantizes to the our most basic
@@ -799,8 +797,8 @@ public:
         return m_refreshStatusArray.getNewRefreshStatusId();
     }
     
-    RefreshtqStatus& getRefreshtqStatus(unsigned int id) {
-        return m_refreshStatusArray.getRefreshtqStatus(id);
+    RefreshStatus& getRefreshStatus(unsigned int id) {
+        return m_refreshStatusArray.getRefreshStatus(id);
     }
 
     /// Set all refresh statuses to true
@@ -989,7 +987,7 @@ protected:
     bool                              m_playMetronome;
     bool                              m_recordMetronome;
 
-    RefreshStatusArray<RefreshtqStatus> m_refreshStatusArray;
+    RefreshStatusArray<RefreshStatus> m_refreshStatusArray;
 
     // User defined markers in the composition
     //

src/base/CompositionTimeSliceAdapter.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/CompositionTimeSliceAdapter.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Configuration.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -28,16 +26,10 @@
 
 #include <string>
 #include <algorithm>
+#include <sstream>
 
 #include "Configuration.h"
 
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
-#include <sstream>
-#endif
-
 
 namespace Rosegarden
 {

src/base/Configuration.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/ControlParameter.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -19,12 +17,7 @@
     COPYING included with this distribution for more information.
 */
 
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
 
 #include "ControlParameter.h"
 #include "MidiTypes.h"

src/base/ControlParameter.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Controllable.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Device.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Device.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Equation.cpp

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Equation.h

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -20,8 +17,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _ETQUATION_H_
-#define _ETQUATION_H_
+#ifndef _EQUATION_H_
+#define _EQUATION_H_
 
 namespace Rosegarden {
 

src/base/Event.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -22,16 +20,11 @@
 #include <cstdio>
 #include <cctype>
 #include <iostream>
+#include <sstream>
+
 #include "Event.h"
 #include "XmlExportable.h"
 
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
-#include <sstream>
-#endif
-
 namespace Rosegarden 
 {
 using std::string;

src/base/Event.h

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Exception.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Exception.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/FastVector.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Instrument.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -20,19 +18,13 @@
 */
 
 #include <stdio.h>
+#include <sstream>
 
 #include "Instrument.h"
 #include "MidiDevice.h"
 #include "AudioPluginInstance.h"
 #include "AudioLevel.h"
 
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
-#include <sstream>
-#endif
-
 
 namespace Rosegarden
 {

src/base/Instrument.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/LayoutEngine.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/LayoutEngine.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -31,7 +29,7 @@ class TimeSignature;
 
 
 /**
- * Base classes for tqlayout engines.  The intention is that
+ * Base classes for layout engines.  The intention is that
  * different sorts of renderers (piano-roll, score etc) can be
  * implemented by simply plugging different implementations
  * of Staff and LayoutEngine into a single view class.
@@ -58,9 +56,9 @@ public:
                             timeT endTime = 0) = 0;
 
     /**
-     * Precomputes tqlayout data for a single staff, updating any
+     * Precomputes layout data for a single staff, updating any
      * internal data stores associated with that staff and updating
-     * any tqlayout-related properties in the events on the staff's
+     * any layout-related properties in the events on the staff's
      * segment.
      * 
      * If startTime == endTime, act on the whole staff; otherwise only
@@ -71,10 +69,10 @@ public:
                            timeT endTime = 0) = 0;
 
     /**
-     * Computes any tqlayout data that may depend on the results of
+     * Computes any layout data that may depend on the results of
      * scanning more than one staff.  This may mean doing most of
-     * the tqlayout (likely for horizontal tqlayout) or nothing at all
-     * (likely for vertical tqlayout).
+     * the layout (likely for horizontal layout) or nothing at all
+     * (likely for vertical layout).
      * 
      * If startTime == endTime, act on the whole staff; otherwise only
      * the given section.
@@ -82,7 +80,7 @@ public:
     virtual void finishLayout(timeT startTime = 0,
                               timeT endTime = 0) = 0;
 
-    unsigned int gettqStatus() const { return m_status; }
+    unsigned int getStatus() const { return m_status; }
 
 protected:
     unsigned int m_status;
@@ -97,9 +95,9 @@ public:
     virtual ~HorizontalLayoutEngine();
 
     /**
-     * Sets a page width for the tqlayout.
+     * Sets a page width for the layout.
      *
-     * A tqlayout implementation does not have to use this.  Some might
+     * A layout implementation does not have to use this.  Some might
      * use it (for example) to ensure that bar lines fall precisely at
      * the right-hand margin of each page.  The computed x-coordinates
      * will still require to be wrapped into lines by the staff or

src/base/LegatoQuantizer.cpp

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/LegatoQuantizer.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -19,8 +17,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef LEGATO_TQUANTIZER_H
-#define LEGATO_TQUANTIZER_H
+#ifndef LEGATO_QUANTIZER_H
+#define LEGATO_QUANTIZER_H
 
 #include "Quantizer.h"
 

src/base/Marker.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -19,17 +17,11 @@
     COPYING included with this distribution for more information.
 */
 
+#include <sstream>
 
 #include "Marker.h"
 #include "misc/Debug.h"
 
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
-#include <sstream>
-#endif
-
 namespace Rosegarden
 {
 

src/base/Marker.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/MidiDevice.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -28,13 +26,7 @@
 #include <cstdlib>
 #include <iostream>
 #include <set>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
 
 
 namespace Rosegarden

src/base/MidiDevice.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/MidiProgram.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/MidiProgram.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/MidiTypes.cpp

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/MidiTypes.h

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/NotationQuantizer.cpp

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -37,7 +34,7 @@ using std::cout;
 using std::cerr;
 using std::endl;
 
-//#define DEBUG_NOTATION_TQUANTIZER 1
+//#define DEBUG_NOTATION_QUANTIZER 1
 
 namespace Rosegarden {
 
@@ -83,7 +80,7 @@ public:
 	}
 	virtual timeT getQuantizedAbsoluteTime(const Event *e) const {
 	    timeT t = m_impl->getProvisional((Event *)e, AbsoluteTimeValue);
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	    cout << "ProvisionalQuantizer::getQuantizedAbsoluteTime: returning " << t << endl;
 #endif
 	    return t;
@@ -295,7 +292,7 @@ NotationQuantizer::Impl::quantizeAbsoluteTime(Segment *s, Segment::iterator i) c
     long bestScore = 0;
     bool bestRight = false;
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
     cout << "quantizeAbsoluteTime: t is " << t << ", d is " << d << endl;
 #endif
 
@@ -321,7 +318,7 @@ NotationQuantizer::Impl::quantizeAbsoluteTime(Segment *s, Segment::iterator i) c
 	}
     }
     
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
     if (n != s->end() && n != nprime) {
 	cout << "found n (distinct from nprime) at " << (*n)->getAbsoluteTime() << endl;
     }
@@ -340,7 +337,7 @@ NotationQuantizer::Impl::quantizeAbsoluteTime(Segment *s, Segment::iterator i) c
 					      t, d, noteType, n, nprime, right);
 
 	if (depth == 0 || score < bestScore) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	    cout << " [*]";
 #endif
 	    bestBase = base;
@@ -348,13 +345,13 @@ NotationQuantizer::Impl::quantizeAbsoluteTime(Segment *s, Segment::iterator i) c
 	    bestRight = right;
 	}
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << endl;
 #endif
     }
 
     if (bestBase == -2) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "Quantizer::quantizeAbsoluteTime: weirdness: no snap found" << endl;
 #endif
     } else {
@@ -373,7 +370,7 @@ NotationQuantizer::Impl::quantizeAbsoluteTime(Segment *s, Segment::iterator i) c
 
 	t += sigTime;
 	
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "snap base is " << bestBase << ", snapped to " << t << endl;
 #endif
     }
@@ -457,7 +454,7 @@ NotationQuantizer::Impl::scoreAbsoluteTimeForBase(Segment *s,
 	    }
 	}
     
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "  depth/eff/dist/t/score/pen1/pen2/res: " << depth << "/" << effectiveDepth << "/" << distance << "/" << (right ? t + distance : t - distance) << "/" << score << "/" << penalty1 << "/" << penalty2 << "/" << (score * penalty1 * penalty2);
 	if (right) cout << " -> ";
 	else cout << " <- ";
@@ -553,7 +550,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const
 
     Profiler profiler("NotationQuantizer::Impl::quantizeDuration");
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
     cout << "quantizeDuration: chord has " << c.size() << " notes" << endl;
 #endif
 
@@ -584,7 +581,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const
 	if ((**ci)->has(m_provisionalDuration) &&
 	    (**ci)->has(BEAMED_GROUP_TUPLET_BASE)) {
 	    // dealt with already in tuplet code, we'd only mess it up here
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	    cout << "not recalculating duration for tuplet" << endl;
 #endif
 	    continue;
@@ -595,7 +592,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const
 	if (!m_contrapuntal) {
 	    // if not contrapuntal, give all notes in chord equal duration
 	    if (nonContrapuntalDuration > 0) {
-#ifdef DEBUG_NOTATION_TQUANTIZER 
+#ifdef DEBUG_NOTATION_QUANTIZER 
 		cout << "setting duration trivially to " << nonContrapuntalDuration << endl;
 #endif
 		setProvisional(**ci, DurationValue, nonContrapuntalDuration);
@@ -613,7 +610,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const
 
 	timeT qt = getProvisional(**ci, AbsoluteTimeValue);
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "note at time " << (**ci)->getAbsoluteTime() << " (provisional time " << qt << ")" << endl;
 #endif
 
@@ -626,7 +623,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const
 	    base /= divisions[depth];
 	}
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "duration is " << ud << ", probably between "
 		  << bases.first << " and " << bases.second << endl;
 #endif
@@ -645,7 +642,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const
 
 	    qd = Note::getNearestNote(spaceAvailable).getDuration();
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	    cout << "non-contrapuntal segment, rounded duration down to "
 		 << qd << " (as only " << spaceAvailable << " available)"
 		 << endl;
@@ -675,7 +672,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const
 		bases.second == absTimeBase) {
 		
 		if (nextNoteTime >= qt + bases.second) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 		    cout << "We rounded to " << qd
 			 << " but we're on " << absTimeBase << " absTimeBase"
 			 << " and the next base is " << bases.second
@@ -699,14 +696,14 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const
 		    if (note.getNoteType() < Note::Longest) {
 			
 			if (bases.second <= spaceAvailable) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 			    cout << "We rounded down to " << qd
 				 << " but have room for " << bases.second
 				 << ", rounding up again" << endl;
 #endif
 			    qd = bases.second;
 			} else {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 			    cout << "We rounded down to " << qd
 				 << "; can't fit " << bases.second << endl;
 #endif
@@ -720,7 +717,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const
 	if (!m_contrapuntal) nonContrapuntalDuration = qd;
     }
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
     cout << "totalFrac " << totalFrac << ", totalFracCount " << totalFracCount << ", avg " << (totalFracCount > 0 ? (totalFrac / totalFracCount) : 0) << endl;
 #endif
 }
@@ -746,7 +743,7 @@ NotationQuantizer::Impl::scanTupletsInBar(Segment *s,
 	if (depth >= 0) base /= divisions[depth];
 	if (base <= Note(Note::Semiquaver).getDuration()) break;
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "\nscanTupletsInBar: trying at depth " << depth << " (base " << base << ")" << endl;
 #endif
 
@@ -766,7 +763,7 @@ NotationQuantizer::Impl::scanTupletsInBar(Segment *s,
 		continue;
 	    }
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	    cout << "scanTupletsInBar: testing " << tupletStart << "," << base << " at tuplet base " << tupletBase << endl;
 #endif
 
@@ -786,7 +783,7 @@ NotationQuantizer::Impl::scanTupletsInBar(Segment *s,
 	    }
 
 	    if (jTime >= tupletEnd) { // nothing to make tuplets of
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 		cout << "scanTupletsInBar: nothing here" << endl;
 #endif
 		tupletStart = tupletEnd;
@@ -827,14 +824,14 @@ NotationQuantizer::Impl::scanTupletsAt(Segment *s,
 	
 	if (!(*j)->isa(Note::EventType)) { ++j; continue; }
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "scanTupletsAt time " << jTime << " (unquantized "
 	     << (*j)->getAbsoluteTime() << "), found note" << endl;
 #endif
 
 	// reject any group containing anything already a tuplet
 	if ((*j)->has(BEAMED_GROUP_TUPLET_BASE)) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	    cout << "already made tuplet here" << endl;
 #endif
 	    return;
@@ -843,19 +840,19 @@ NotationQuantizer::Impl::scanTupletsAt(Segment *s,
 	timeT originalBase;
 
 	if (!(*j)->get<Int>(m_provisionalBase, originalBase)) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	    cout << "some notes not provisionally quantized, no good" << endl;
 #endif
 	    return;
 	}
 
 	if (originalBase == base) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	    cout << "accepting note at original base" << endl;
 #endif
 	    candidates.push_back(*j);
 	} else if (((jTime - sigTime) % base) == 0) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	    cout << "accepting note that happens to lie on original base" << endl;
 #endif
 	    candidates.push_back(*j);
@@ -867,7 +864,7 @@ NotationQuantizer::Impl::scanTupletsAt(Segment *s,
 	    // any of the likelihood tests for tuplets.
 
 	    if (!isValidTupletAt(s, j, depth, base, sigTime, tupletBase)) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 		cout << "no good" << endl;
 #endif
 		return;
@@ -883,13 +880,13 @@ NotationQuantizer::Impl::scanTupletsAt(Segment *s,
     // must have at least one note that is not already quantized to the
     // original base
     if (count < 1) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "scanTupletsAt: found no note not already quantized to " << base << endl;
 #endif
 	return;
     }
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
     cout << "scanTupletsAt: Tuplet group of duration " << base << " starting at " << tupletStart << endl;
 #endif
 
@@ -970,7 +967,7 @@ NotationQuantizer::Impl::isValidTupletAt(Segment *s,
     timeT ud = m_q->getFromSource(*i, DurationValue);
 
     if (ud > (tupletBase * 5 / 4)) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "\nNotationQuantizer::isValidTupletAt: note too long at "
 	     << (*i)->getDuration() << " (tupletBase is " << tupletBase << ")"
 	     << endl;
@@ -981,7 +978,7 @@ NotationQuantizer::Impl::isValidTupletAt(Segment *s,
     //!!! This bit is a cop-out.  It means we reject anything that looks
     // like it's going to have rests in it.  Bah.
     if (ud <= (tupletBase * 3 / 8)) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "\nNotationQuantizer::isValidTupletAt: note too short at "
 	     << (*i)->getDuration() << " (tupletBase is " << tupletBase << ")"
 	     << endl;
@@ -1000,7 +997,7 @@ NotationQuantizer::Impl::isValidTupletAt(Segment *s,
     bool dummy;
     long tupletScore = scoreAbsoluteTimeForBase
 	(s, i, depth, tupletBase, sigTime, t, d, noteType, s->end(), s->end(), dummy);
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
     cout << "\nNotationQuantizer::isValidTupletAt: score " << score
 	 << " vs tupletScore " << tupletScore << endl;
 #endif
@@ -1027,7 +1024,7 @@ NotationQuantizer::Impl::quantizeRange(Segment *s,
     int events = 0, notes = 0, passes = 0;
     int setGood = 0, setBad = 0;
     
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
     cout << "NotationQuantizer::Impl::quantizeRange: from time "
 	      << (from == s->end() ? -1 : (*from)->getAbsoluteTime())
 	      << " to "
@@ -1177,7 +1174,7 @@ NotationQuantizer::Impl::quantizeRange(Segment *s,
 	    (*i)->getDuration() == d) ++setBad;
 	else ++setGood;
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "Setting to target at " << t << "," << d << endl;
 #endif
 

src/base/NotationQuantizer.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -19,8 +17,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef NOTATION_TQUANTIZER_H_
-#define NOTATION_TQUANTIZER_H_
+#ifndef NOTATION_QUANTIZER_H_
+#define NOTATION_QUANTIZER_H_
 
 #include "Quantizer.h"
 

src/base/NotationRules.h

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/NotationTypes.cpp

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -28,12 +25,7 @@
 #include <cstdlib> // for atoi
 #include <limits.h> // for SHRT_MIN
 #include <cassert>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#else
 #include <sstream>
-#endif
 
 //dmm This will make everything excruciatingly slow if defined:
 //#define DEBUG_PITCH
@@ -481,19 +473,10 @@ Key::Key(int accidentalCount, bool isSharp, bool isMinor) :
         }
     }
 
-#if (__GNUC__ < 3)
-    std::ostrstream os;
-#else
     std::ostringstream os;
-#endif
-
     os << "No " << (isMinor ? "minor" : "major") << " key with "
        << accidentalCount << (isSharp ? " sharp(s)" : " flat(s)");
 
-#if (__GNUC__ < 3)
-    os << std::ends;
-#endif
-
     throw BadKeySpec(os.str());
 }
 
@@ -514,19 +497,11 @@ Key::Key(int tonicPitch, bool isMinor) :
         }
     }
 
-#if (__GNUC__ < 3)
-    std::ostrstream os;
-#else
     std::ostringstream os;
-#endif
 
     os << "No " << (isMinor ? "minor" : "major") << " key with tonic pitch "
        << tonicPitch;
 
-#if (__GNUC__ < 3)
-    os << std::ends;
-#endif
-
     throw BadKeySpec(os.str());
 }
     

src/base/NotationTypes.h

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Profiler.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Profiler.h

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Property.cpp

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Property.h

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/PropertyMap.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/PropertyName.cpp

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/PropertyName.h

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Quantizer.cpp

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -37,7 +34,7 @@ using std::cout;
 using std::cerr;
 using std::endl;
 
-//#define DEBUG_NOTATION_TQUANTIZER 1
+//#define DEBUG_NOTATION_QUANTIZER 1
 
 namespace Rosegarden {
 
@@ -366,7 +363,7 @@ Quantizer::setToTarget(Segment *s, Segment::iterator i,
 	// that are already being referred to in ViewElementLists,
 	// preventing us from locating them in the ViewElementLists
 	// because their ordering would have silently changed
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "Quantizer: setting " << absTime << " to notation absolute time and "
 	     << duration << " to notation duration"
 	     << endl;
@@ -404,7 +401,7 @@ Quantizer::setToTarget(Segment *s, Segment::iterator i,
 	m_toInsert.push_back(e);
     }
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
     cout << "m_toInsert.size() is now " << m_toInsert.size() << endl;
 #endif
 }
@@ -464,7 +461,7 @@ Quantizer::insertNewEvents(Segment *s) const
 	s->insert(m_toInsert[i]);
     }
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
     cout << "Quantizer::insertNewEvents: sz is " << sz
 	      << ", minTime " << minTime << ", maxTime " << maxTime
 	      << endl;
@@ -482,7 +479,7 @@ Quantizer::insertNewEvents(Segment *s) const
 	}
     }
 		
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "Quantizer: calling normalizeRests("
 		  << minTime << ", " << maxTime << ")" << endl;
 #endif

src/base/Quantizer.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -19,8 +17,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef TQUANTIZER_H
-#define TQUANTIZER_H
+#ifndef QUANTIZER_H
+#define QUANTIZER_H
 
 #include "Segment.h"
 #include "Event.h"

src/base/RealTime.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -20,13 +18,7 @@
 */
 
 #include <iostream>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
 
 #include "RealTime.h"
 #include "sys/time.h"

src/base/RealTime.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/RefreshStatus.h

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -26,10 +23,10 @@
 namespace Rosegarden 
 {
 
-class RefreshtqStatus
+class RefreshStatus
 {
 public:
-    RefreshtqStatus() : m_needsRefresh(true) {}
+    RefreshStatus() : m_needsRefresh(true) {}
 
     bool needsRefresh() { return m_needsRefresh; }
     void setNeedsRefresh(bool s) { m_needsRefresh = s; }
@@ -44,7 +41,7 @@ class RefreshStatusArray
 public:
     unsigned int getNewRefreshStatusId();
     size_t size() { return m_refreshStatuses.size(); }
-    RS& getRefreshtqStatus(unsigned int id) { return m_refreshStatuses[id]; }
+    RS& getRefreshStatus(unsigned int id) { return m_refreshStatuses[id]; }
     void updateRefreshStatuses();
 
 protected:

src/base/ScriptAPI.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/ScriptAPI.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Segment.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -352,7 +350,7 @@ void
 Segment::updateRefreshStatuses(timeT startTime, timeT endTime)
 {
     for(unsigned int i = 0; i < m_refreshStatusArray.size(); ++i)
-        m_refreshStatusArray.getRefreshtqStatus(i).push(startTime, endTime);
+        m_refreshStatusArray.getRefreshStatus(i).push(startTime, endTime);
 }
 
 
@@ -1269,7 +1267,7 @@ SegmentHelper::~SegmentHelper() { }
 
 
 void 
-SegmentRefreshtqStatus::push(timeT from, timeT to)
+SegmentRefreshStatus::push(timeT from, timeT to)
 {
     if (!needsRefresh()) { // don't do anything subtle - just erase the old data
 

src/base/Segment.h

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -37,10 +34,10 @@
 namespace Rosegarden 
 {
 
-class SegmentRefreshtqStatus : public RefreshtqStatus
+class SegmentRefreshStatus : public RefreshStatus
 {
 public:
-    SegmentRefreshtqStatus() : m_from(0), m_to(0) {}
+    SegmentRefreshStatus() : m_from(0), m_to(0) {}
 
     void push(timeT from, timeT to);
 
@@ -283,7 +280,7 @@ public:
 
     //////
     //
-    // TQUANTIZATION
+    // QUANTIZATION
 
     /**
      * Switch quantization on or off.
@@ -616,8 +613,8 @@ public:
         return m_refreshStatusArray.getNewRefreshStatusId();
     }
 
-    SegmentRefreshtqStatus &getRefreshtqStatus(unsigned int id) {
-        return m_refreshStatusArray.getRefreshtqStatus(id);
+    SegmentRefreshStatus &getRefreshStatus(unsigned int id) {
+        return m_refreshStatusArray.getRefreshStatus(id);
     }
 
     void updateRefreshStatuses(timeT startTime, timeT endTime);
@@ -657,7 +654,7 @@ private:
     int m_highestPlayable;      // suggestion for highest playable note (notation)
     int m_lowestPlayable;       // suggestion for lowest playable note (notation)
 
-    RefreshStatusArray<SegmentRefreshtqStatus> m_refreshStatusArray;
+    RefreshStatusArray<SegmentRefreshStatus> m_refreshStatusArray;
 
     struct ClefKeyCmp {
         bool operator()(const Event *e1, const Event *e2) const;

src/base/SegmentMatrixHelper.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/SegmentMatrixHelper.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/SegmentNotationHelper.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -1767,7 +1765,7 @@ SegmentNotationHelper::removeRests(timeT time, timeT &duration, bool testOnly)
     segment().erase(from, to);
 
     // we must defer calling makeRestViable() until after erase,
-    // because it will tqinvalidate 'to'
+    // because it will invalidate 'to'
     //
     if (checkLastRest) makeRestViable(lastEvent);
 

src/base/SegmentNotationHelper.h

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -34,7 +31,7 @@ public:
     SegmentNotationHelper(Segment &t) : SegmentHelper(t) { }
     virtual ~SegmentNotationHelper();
 
-    SegmentHelper::segment;
+    using SegmentHelper::segment;
 
     /**
      * Set the NOTE_TYPE and NOTE_DOTS properties on the events

src/base/SegmentPerformanceHelper.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/SegmentPerformanceHelper.h

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Selection.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Selection.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Sets.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Sets.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -287,7 +285,7 @@ AbstractSet<Element, Container>::initialise()
     m_final = m_baseIterator;
     sample(m_baseIterator, true);
 
-    if (getAsEvent(m_baseIterator)->isa(Note::EventType)) {
+    if (AbstractSet::getAsEvent(m_baseIterator)->isa(Note::EventType)) {
         m_initialNote = m_baseIterator;
         m_finalNote = m_baseIterator;
     }
@@ -300,7 +298,7 @@ AbstractSet<Element, Container>::initialise()
     for (i = j = m_baseIterator; i != getContainer().begin() && test(--j); i = j){
         if (sample(j, false)) {
             m_initial = j;
-            if (getAsEvent(j)->isa(Note::EventType)) {
+            if (AbstractSet::getAsEvent(j)->isa(Note::EventType)) {
 		m_initialNote = j;
 		if (m_finalNote == getContainer().end()) {
 		    m_finalNote = j;
@@ -317,7 +315,7 @@ AbstractSet<Element, Container>::initialise()
     for (i = j = m_baseIterator; ++j != getContainer().end() && test(j); i = j) {
         if (sample(j, true)) {
             m_final = j;
-            if (getAsEvent(j)->isa(Note::EventType)) {
+            if (AbstractSet::getAsEvent(j)->isa(Note::EventType)) {
 		m_finalNote = j;
 		if (m_initialNote == getContainer().end()) {
 		    m_initialNote = j;
@@ -332,17 +330,17 @@ bool
 AbstractSet<Element, Container>::sample(const Iterator &i, bool)
 {
     const Quantizer &q(getQuantizer());
-    Event *e = getAsEvent(i);
+    Event *e = AbstractSet::getAsEvent(i);
     timeT d(q.getQuantizedDuration(e));
     
     if (e->isa(Note::EventType) || d > 0) {
         if (m_longest == getContainer().end() ||
-            d > q.getQuantizedDuration(getAsEvent(m_longest))) {
+            d > q.getQuantizedDuration(AbstractSet::getAsEvent(m_longest))) {
 //          std::cerr << "New longest in set at duration " << d << " and time " << e->getAbsoluteTime() << std::endl;
             m_longest = i;
         }
         if (m_shortest == getContainer().end() ||
-            d < q.getQuantizedDuration(getAsEvent(m_shortest))) {
+            d < q.getQuantizedDuration(AbstractSet::getAsEvent(m_shortest))) {
 //          std::cerr << "New shortest in set at duration " << d << " and time " << e->getAbsoluteTime() << std::endl;
             m_shortest = i;
         }
@@ -352,12 +350,12 @@ AbstractSet<Element, Container>::sample(const Iterator &i, bool)
         long p = get__Int(e, BaseProperties::PITCH);
 
         if (m_highest == getContainer().end() ||
-            p > get__Int(getAsEvent(m_highest), BaseProperties::PITCH)) {
+            p > get__Int(AbstractSet::getAsEvent(m_highest), BaseProperties::PITCH)) {
 //          std::cerr << "New highest in set at pitch " << p << " and time " << e->getAbsoluteTime() << std::endl;
             m_highest = i;
         }
         if (m_lowest == getContainer().end() ||
-            p < get__Int(getAsEvent(m_lowest), BaseProperties::PITCH)) {
+            p < get__Int(AbstractSet::getAsEvent(m_lowest), BaseProperties::PITCH)) {
 //          std::cerr << "New lowest in set at pitch " << p << " and time " << e->getAbsoluteTime() << std::endl;
             m_lowest = i;
         }
@@ -376,8 +374,8 @@ GenericChord<Element, Container, singleStaff>::GenericChord(Container &c,
                                                             PropertyName stemUpProperty) :
     AbstractSet<Element, Container>(c, i, q),
     m_stemUpProperty(stemUpProperty),
-    m_time(q->getQuantizedAbsoluteTime(getAsEvent(i))),
-    m_subordering(getAsEvent(i)->getSubOrdering()),
+    m_time(q->getQuantizedAbsoluteTime(GenericChord::getAsEvent(i))),
+    m_subordering(GenericChord::getAsEvent(i)->getSubOrdering()),
     m_firstReject(c.end())
 {
     AbstractSet<Element, Container>::initialise();
@@ -416,7 +414,7 @@ template <class Element, class Container, bool singleStaff>
 bool
 GenericChord<Element, Container, singleStaff>::test(const Iterator &i)
 {
-    Event *e = getAsEvent(i);
+    Event *e = GenericChord::getAsEvent(i);
     if (AbstractSet<Element, Container>::
 	getQuantizer().getQuantizedAbsoluteTime(e) != m_time) {
 	return false;
@@ -452,7 +450,7 @@ bool
 GenericChord<Element, Container, singleStaff>::sample(const Iterator &i,
                                                       bool goingForwards)
 {
-    Event *e1 = getAsEvent(i);
+    Event *e1 = GenericChord::getAsEvent(i);
     if (!e1->isa(Note::EventType)) {
         if (goingForwards && m_firstReject == AbstractSet<Element, Container>::getContainer().end()) m_firstReject = i;
         return false;
@@ -472,7 +470,7 @@ GenericChord<Element, Container, singleStaff>::sample(const Iterator &i,
 
         if (AbstractSet<Element, Container>::m_baseIterator != AbstractSet<Element, Container>::getContainer().end()) {
 
-            Event *e0 = getAsEvent(AbstractSet<Element, Container>::m_baseIterator);
+            Event *e0 = GenericChord::getAsEvent(AbstractSet<Element, Container>::m_baseIterator);
 
             if (!(m_stemUpProperty == PropertyName::EmptyPropertyName)) {
 
@@ -518,7 +516,7 @@ GenericChord<Element, Container, singleStaff>::sample(const Iterator &i,
     }
 
     AbstractSet<Element, Container>::sample(i, goingForwards);
-    push_back(i);
+    this->push_back(i);
     return true;
 }
 
@@ -560,7 +558,7 @@ GenericChord<Element, Container, singleStaff>::getMarkCountForChord() const
 
     for (unsigned int i = 0; i < std::vector<typename Container::iterator>::size(); ++i) {
 
-        Event *e = getAsEvent((*this)[i]);
+        Event *e = GenericChord::getAsEvent((*this)[i]);
         std::vector<Mark> marks(Marks::getMarks(*e));
 
         for (std::vector<Mark>::iterator j = marks.begin(); j != marks.end(); ++j) {
@@ -580,7 +578,7 @@ GenericChord<Element, Container, singleStaff>::getMarksForChord() const
 
     for (unsigned int i = 0; i < std::vector<typename Container::iterator>::size(); ++i) {
 
-        Event *e = getAsEvent((*this)[i]);
+        Event *e = GenericChord::getAsEvent((*this)[i]);
         std::vector<Mark> marks(Marks::getMarks(*e));
 
 
@@ -607,9 +605,9 @@ GenericChord<Element, Container, singleStaff>::getPitches() const
 
     for (typename std::vector<typename Container::iterator>::const_iterator
              i = std::vector<typename Container::iterator>::begin(); i != std::vector<typename Container::iterator>::end(); ++i) {
-        if (getAsEvent(*i)->has(BaseProperties::PITCH)) {
+        if (GenericChord::getAsEvent(*i)->has(BaseProperties::PITCH)) {
             int pitch = get__Int
-                (getAsEvent(*i), BaseProperties::PITCH);
+                (GenericChord::getAsEvent(*i), BaseProperties::PITCH);
             if (pitches.size() > 0 && pitches[pitches.size()-1] == pitch) 
                 continue;
             pitches.push_back(pitch);
@@ -641,7 +639,7 @@ GenericChord<Element, Container, singleStaff>::getPreviousNote()
     while (1) {
         if (i == AbstractSet<Element, Container>::getContainer().begin()) return AbstractSet<Element, Container>::getContainer().end();
         --i;
-        if (getAsEvent(i)->isa(Note::EventType)) {
+        if (GenericChord::getAsEvent(i)->isa(Note::EventType)) {
             return i;
         }
     }
@@ -655,7 +653,7 @@ GenericChord<Element, Container, singleStaff>::getNextNote()
     Iterator i(AbstractSet<Element, Container>::getFinalElement());
     while (  i != AbstractSet<Element, Container>::getContainer().end() &&
            ++i != AbstractSet<Element, Container>::getContainer().end()) {
-        if (getAsEvent(i)->isa(Note::EventType)) {
+        if (GenericChord::getAsEvent(i)->isa(Note::EventType)) {
             return i;
         }
     }
@@ -677,8 +675,8 @@ GenericChord<Element, Container, singleStaff>::PitchGreater::operator()(const It
                                                            const Iterator &b)
 {
     try {
-        long ap = get__Int(getAsEvent(a), BaseProperties::PITCH);
-        long bp = get__Int(getAsEvent(b), BaseProperties::PITCH);
+        long ap = get__Int(GenericChord::getAsEvent(a), BaseProperties::PITCH);
+        long bp = get__Int(GenericChord::getAsEvent(b), BaseProperties::PITCH);
         return (ap < bp);
     } catch (Event::NoData) {
         std::cerr << "Bad karma: PitchGreater failed to find one or both pitches" << std::endl;

src/base/SnapGrid.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/SnapGrid.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/SoftSynthDevice.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -25,14 +23,7 @@
 
 #include <cstdio>
 #include <cstdlib>
-
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
 
 
 namespace Rosegarden

src/base/SoftSynthDevice.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Staff.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Staff.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/StaffExportTypes.h

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/base/Studio.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -20,6 +18,7 @@
 */
 
 #include <iostream>
+#include <sstream>
 
 #include "Studio.h"
 #include "MidiDevice.h"
@@ -30,12 +29,6 @@
 #include "Track.h"
 #include "Composition.h"
 
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
-#include <sstream>
-#endif
 
 using std::cerr;
 using std::endl;

src/base/Studio.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/Track.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -22,13 +20,7 @@
 #include "Track.h"
 #include <iostream>
 #include <cstdio>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
 
 #include "Composition.h"
 #include "StaffExportTypes.h"

src/base/Track.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/TriggerSegment.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -47,7 +45,7 @@ TriggerSegmentRec::TriggerSegmentRec(TriggerSegmentId id,
     m_defaultRetune(retune)
 {
     if (m_defaultTimeAdjust == "") {
-	m_defaultTimeAdjust = BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH;
+	m_defaultTimeAdjust = BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH;
     }
 
     calculateBases();

src/base/TriggerSegment.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/ViewElement.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/ViewElement.h

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.
@@ -53,7 +50,7 @@ public:
 
     /**
      * Returns the X coordinate of the element, as computed by the
-     * tqlayout. This is not the coordinate of the associated canvas
+     * layout. This is not the coordinate of the associated canvas
      * item.
      *
      * @see getCanvasX()
@@ -62,7 +59,7 @@ public:
 
     /**
      * Returns the Y coordinate of the element, as computed by the
-     * tqlayout. This is not the coordinate of the associated canvas
+     * layout. This is not the coordinate of the associated canvas
      * item.
      *
      * @see getCanvasY()
@@ -70,13 +67,13 @@ public:
     virtual double getLayoutY() const   { return m_layoutY; }
 
     /**
-     * Sets the X coordinate which was computed by the tqlayout engine
+     * Sets the X coordinate which was computed by the layout engine
      * @see getLayoutX()
      */
     virtual void   setLayoutX(double x) { m_layoutX = x; }
 
     /**
-     * Sets the Y coordinate which was computed by the tqlayout engine
+     * Sets the Y coordinate which was computed by the layout engine
      * @see getLayoutY()
      */
     virtual void   setLayoutY(double y) { m_layoutY = y; }

src/base/XmlExportable.cpp

@@ -1,4 +1,3 @@
-// -*- c-basic-offset: 4 -*-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/XmlExportable.h

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 /*
     Rosegarden
     A sequencer and musical notation editor.

src/base/test/accidentals.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 #include "NotationTypes.h"
 
 using namespace Rosegarden;

src/base/test/colour.cpp

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
-
 /*
     Rosegarden-4
     A sequencer and musical notation editor.

src/base/test/pitch.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 #include "NotationRules.h"
 #include "NotationTypes.h"
 

src/base/test/seq/complainer.c

@@ -12,7 +12,7 @@ callback(snd_seq_t *handle)
     do {
 	if (snd_seq_event_input(handle, &ev) > 0) {
 
-	    if (ev->type == SND_SETQ_EVENT_NOTEON) {
+	    if (ev->type == SND_SEQ_EVENT_NOTEON) {
 
 		struct timeval tv;
 		static long last_usec = 0;
@@ -40,7 +40,7 @@ main(int argc, char **argv)
     struct pollfd *pfd;
     struct sched_param param;
 
-    if (snd_seq_open(&handle, "hw", SND_SETQ_OPEN_DUPLEX, 0) < 0) {
+    if (snd_seq_open(&handle, "hw", SND_SEQ_OPEN_DUPLEX, 0) < 0) {
 	fprintf(stderr, "failed to open ALSA sequencer interface\n");
 	return 1;
     }
@@ -49,7 +49,7 @@ main(int argc, char **argv)
 
     if ((portid = snd_seq_create_simple_port
 	 (handle, "complainer",
-	  SND_SETQ_PORT_CAP_WRITE | SND_SETQ_PORT_CAP_SUBS_WRITE, 0)) < 0) {
+	  SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_WRITE, 0)) < 0) {
 	fprintf(stderr, "failed to create ALSA sequencer port\n");
 	return 1;
     }

src/base/test/seq/generator.c

@@ -23,7 +23,7 @@ main(int argc, char **argv)
     }
     target = atoi(argv[1]);
 
-    if (snd_seq_open(&handle, "hw", SND_SETQ_OPEN_DUPLEX, 0) < 0) {
+    if (snd_seq_open(&handle, "hw", SND_SEQ_OPEN_DUPLEX, 0) < 0) {
 	fprintf(stderr, "failed to open ALSA sequencer interface\n");
 	return 1;
     }
@@ -32,7 +32,7 @@ main(int argc, char **argv)
 
     if ((portid = snd_seq_create_simple_port
 	 (handle, "generator",
-	  SND_SETQ_PORT_CAP_READ | SND_SETQ_PORT_CAP_SUBS_READ, 0)) < 0) {
+	  SND_SEQ_PORT_CAP_READ | SND_SEQ_PORT_CAP_SUBS_READ, 0)) < 0) {
 	fprintf(stderr, "failed to create ALSA sequencer port\n");
 	return 1;
     }

src/base/test/seq/queue-timer-jack.c

@@ -63,7 +63,7 @@ main(int argc, char **argv)
 
     sample_rate = jack_get_sample_rate(jclient);
 
-    if (snd_seq_open(&handle, "hw", SND_SETQ_OPEN_DUPLEX, 0) < 0) {
+    if (snd_seq_open(&handle, "hw", SND_SEQ_OPEN_DUPLEX, 0) < 0) {
 	fprintf(stderr, "failed to open ALSA sequencer interface\n");
 	return 1;
     }
@@ -72,7 +72,7 @@ main(int argc, char **argv)
 
     if ((portid = snd_seq_create_simple_port
 	 (handle, "generator",
-	  SND_SETQ_PORT_CAP_READ | SND_SETQ_PORT_CAP_SUBS_READ, 0)) < 0) {
+	  SND_SEQ_PORT_CAP_READ | SND_SEQ_PORT_CAP_SUBS_READ, 0)) < 0) {
 	fprintf(stderr, "failed to create ALSA sequencer port\n");
 	return 1;
     }

src/base/test/seq/queue-timer.c

@@ -32,7 +32,7 @@ main(int argc, char **argv)
     snd_seq_queue_timer_t *timer;
     snd_timer_id_t *timerid;
 
-    if (snd_seq_open(&handle, "hw", SND_SETQ_OPEN_DUPLEX, 0) < 0) {
+    if (snd_seq_open(&handle, "hw", SND_SEQ_OPEN_DUPLEX, 0) < 0) {
 	fprintf(stderr, "failed to open ALSA sequencer interface\n");
 	return 1;
     }
@@ -41,7 +41,7 @@ main(int argc, char **argv)
 
     if ((portid = snd_seq_create_simple_port
 	 (handle, "generator",
-	  SND_SETQ_PORT_CAP_READ | SND_SETQ_PORT_CAP_SUBS_READ, 0)) < 0) {
+	  SND_SEQ_PORT_CAP_READ | SND_SEQ_PORT_CAP_SUBS_READ, 0)) < 0) {
 	fprintf(stderr, "failed to create ALSA sequencer port\n");
 	return 1;
     }

src/base/test/test.cpp

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-// -*- c-file-style:  "bsd" -*-
-
 #define NDEBUG
 
 // This does some rather shoddy tests on a small selection of core classes.

src/base/test/thread.cpp

@@ -1,6 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-// -*- c-file-style:  "bsd" -*-
-
 // This does some rather shoddy tests on a small selection of core classes.
 
 #include "Lock.h"

src/base/test/transpose.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 #include "NotationTypes.h"
 
 using namespace Rosegarden;

src/base/test/utf8.cpp

@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 4 -*-
-
 #include "XmlExportable.h"
 #include <iostream>
 #include <string>

src/commands/edit/AddDotCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/AddDotCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -28,7 +25,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/edit/AddMarkerCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/AddMarkerCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -30,7 +27,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/edit/ChangeVelocityCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/ChangeVelocityCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -28,7 +25,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/edit/ClearTriggersCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/ClearTriggersCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -28,7 +25,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
@@ -44,7 +41,7 @@ class ClearTriggersCommand : public BasicSelectionCommand
 public:
     ClearTriggersCommand(EventSelection &selection,
                          TQString name = 0) :
-        BasicSelectionCommand(name ? name : getGlobalName(), selection, true),
+        BasicSelectionCommand(!name.isNull() ? name : getGlobalName(), selection, true),
         m_selection(&selection)
     { }
 

src/commands/edit/CollapseNotesCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/CollapseNotesCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -28,7 +25,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class Collapse;

src/commands/edit/CopyCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -61,7 +59,7 @@ CopyCommand::CopyCommand(SegmentSelection &selection,
             m_sourceClipboard->newSegment(*i);
         } else {
             m_sourceClipboard->newSegment(*i)->
-            setLabel(qstrtostr(i18n("%1 (copied)").tqarg(newLabel)));
+            setLabel(qstrtostr(i18n("%1 (copied)").arg(newLabel)));
         }
     }
 }

src/commands/edit/CopyCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -29,7 +26,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/edit/CutAndCloseCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/CutAndCloseCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -29,7 +26,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/edit/CutCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/CutCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -27,7 +24,7 @@
 #define _RG_CUTCOMMAND_H_
 
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcommand.h>
 
 

src/commands/edit/EraseCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/EraseCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -29,7 +26,7 @@
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/edit/EventEditCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/EventEditCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -29,7 +26,7 @@
 #include "base/Event.h"
 #include "document/BasicCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/edit/EventInsertionCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -25,7 +23,7 @@
 
 #include "EventInsertionCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/Segment.h"
 #include "document/BasicCommand.h"

src/commands/edit/EventInsertionCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/EventQuantizeCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -25,7 +23,7 @@
 
 #include "EventQuantizeCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/NotationTypes.h"
 #include "base/Profiler.h"
 #include "base/Quantizer.h"
@@ -36,11 +34,11 @@
 #include "base/SegmentNotationHelper.h"
 #include "base/Selection.h"
 #include "document/BasicCommand.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqstring.h>
 #include "base/BaseProperties.h"
 #include "gui/application/RosegardenApplication.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 
 namespace Rosegarden
@@ -132,9 +130,9 @@ EventQuantizeCommand::modifySegment()
     bool makeviable = false;
     bool decounterpoint = false;
 
-    if (m_configGroup) {
+    if (!m_configGroup.isNull()) {
         //!!! need way to decide whether to do these even if no config group (i.e. through args to the command)
-        KConfig *config = kapp->config();
+        TDEConfig *config = tdeApp->config();
         config->setGroup(m_configGroup);
 
         rebeam = config->readBoolEntry("quantizerebeam", true);
@@ -204,7 +202,7 @@ EventQuantizeCommand::makeQuantizer(TQString configGroup,
     //!!! Excessive duplication with
     // QuantizeParameters::getQuantizer in widgets.cpp
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(configGroup);
 
     timeT defaultUnit =

src/commands/edit/EventQuantizeCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -23,8 +20,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RG_EVENTQUANTIZECOMMAND_H_
-#define _RG_EVENTQUANTIZECOMMAND_H_
+#ifndef _RG_EVENQUANTIZECOMMAND_H_
+#define _RG_EVENQUANTIZECOMMAND_H_
 
 #include "document/BasicCommand.h"
 #include <tqobject.h>
@@ -44,8 +41,8 @@ class EventSelection;
 
 class EventQuantizeCommand : public TQObject, public BasicCommand
 {
-    Q_OBJECT
-  TQ_OBJECT
+    TQ_OBJECT
+  
 
 public:
     /// Quantizer must be on heap (EventQuantizeCommand dtor will delete)
@@ -58,14 +55,14 @@ public:
     EventQuantizeCommand(EventSelection &selection,
                          Quantizer *);
 
-    /// Constructs own quantizer based on KConfig data in given group
+    /// Constructs own quantizer based on TDEConfig data in given group
     EventQuantizeCommand(Segment &segment,
                          timeT startTime,
                          timeT endTime,
                          TQString configGroup,
                          bool notationDefault);
     
-    /// Constructs own quantizer based on KConfig data in given group
+    /// Constructs own quantizer based on TDEConfig data in given group
     EventQuantizeCommand(EventSelection &selection,
                          TQString configGroup,
                          bool notationDefault);

src/commands/edit/EventUnquantizeCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -25,7 +23,7 @@
 
 #include "EventUnquantizeCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Quantizer.h"
 #include "base/Segment.h"
 #include "base/Selection.h"

src/commands/edit/EventUnquantizeCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -23,8 +20,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RG_EVENTUNTQUANTIZECOMMAND_H_
-#define _RG_EVENTUNTQUANTIZECOMMAND_H_
+#ifndef _RG_EVENTUNQUANTIZECOMMAND_H_
+#define _RG_EVENTUNQUANTIZECOMMAND_H_
 
 #include "document/BasicCommand.h"
 #include <tqstring.h>

src/commands/edit/InsertTriggerNoteCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -25,7 +23,7 @@
 
 #include "InsertTriggerNoteCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/NotationTypes.h"
 #include "base/Segment.h"

src/commands/edit/InsertTriggerNoteCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/InvertCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/InvertCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -28,7 +25,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/edit/ModifyMarkerCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/ModifyMarkerCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -30,7 +27,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/edit/MoveAcrossSegmentsCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -25,7 +23,7 @@
 
 #include "MoveAcrossSegmentsCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Clipboard.h"
 #include "base/Segment.h"
 #include "base/Selection.h"

src/commands/edit/MoveAcrossSegmentsCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/MoveCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/MoveCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/PasteEventsCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -54,7 +52,7 @@ PasteEventsCommand::PasteEventsCommand(Segment &segment,
 {
     if (pasteType != OpenAndPaste) {
 
-        // paste clef or key -> retqlayout to end
+        // paste clef or key -> relayout to end
 
         if (clipboard->isSingleSegment()) {
 

src/commands/edit/PasteEventsCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -31,7 +28,7 @@
 #include <map>
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/edit/PasteSegmentsCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/PasteSegmentsCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -31,7 +28,7 @@
 #include <tqstring.h>
 #include <vector>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/edit/RemoveMarkerCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/RemoveMarkerCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -30,7 +27,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/edit/RescaleCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/RescaleCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -29,7 +26,7 @@
 #include "document/BasicCommand.h"
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/edit/RetrogradeCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/RetrogradeCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -28,7 +25,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/edit/RetrogradeInvertCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/RetrogradeInvertCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -28,7 +25,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/edit/SelectionPropertyCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/SelectionPropertyCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -29,7 +26,7 @@
 #include "base/PropertyName.h"
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class Set;

src/commands/edit/SetLyricsCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/SetLyricsCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -29,7 +26,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include <vector>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/edit/SetNoteTypeCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/SetNoteTypeCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -29,7 +26,7 @@
 #include "base/NotationTypes.h"
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/edit/SetTriggerCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/SetTriggerCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -30,7 +27,7 @@
 #include "document/BasicSelectionCommand.h"
 #include <string>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
@@ -51,7 +48,7 @@ public:
                       std::string timeAdjust,
                       Mark mark,
                       TQString name = 0) :
-        BasicSelectionCommand(name ? name : getGlobalName(), selection, true),
+        BasicSelectionCommand(!name.isNull() ? name : getGlobalName(), selection, true),
         m_selection(&selection),
         m_triggerSegmentId(triggerSegmentId),
         m_notesOnly(notesOnly),

src/commands/edit/TransposeCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/edit/TransposeCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -28,7 +25,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/matrix/MatrixEraseCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -25,7 +23,7 @@
 
 #include "MatrixEraseCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/NotationTypes.h"
 #include "base/Segment.h"

src/commands/matrix/MatrixEraseCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/matrix/MatrixInsertionCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -25,7 +23,7 @@
 
 #include "MatrixInsertionCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/Segment.h"
 #include "base/SegmentMatrixHelper.h"

src/commands/matrix/MatrixInsertionCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/matrix/MatrixModifyCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -26,7 +24,7 @@
 #include "MatrixModifyCommand.h"
 
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/NotationTypes.h"
 #include "base/Segment.h"
 #include "document/BasicCommand.h"

src/commands/matrix/MatrixModifyCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/matrix/MatrixPercussionInsertionCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -25,7 +23,7 @@
 
 #include "MatrixPercussionInsertionCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Composition.h"
 #include "base/Event.h"
 #include "base/NotationTypes.h"

src/commands/matrix/MatrixPercussionInsertionCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/notation/AddFingeringMarkCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -25,7 +23,7 @@
 
 #include "AddFingeringMarkCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/NotationTypes.h"
 #include "base/NotationQuantizer.h"
 #include "base/Segment.h"
@@ -46,7 +44,7 @@ AddFingeringMarkCommand::getGlobalName(TQString fingering)
     else if (fingering == "0")
         return i18n("Add Fingering &0 (Thumb)");
     else
-        return i18n("Add Fingering &%1").tqarg(fingering);
+        return i18n("Add Fingering &%1").arg(fingering);
 }
 
 void

src/commands/notation/AddFingeringMarkCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/notation/AddIndicationCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -25,7 +23,7 @@
 
 #include "AddIndicationCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "base/Event.h"
 #include "base/NotationTypes.h"
@@ -164,7 +162,7 @@ AddIndicationCommand::getGlobalName(std::string indicationType)
         return i18n("Add &Glissando");
     }
 
-    TQString n = i18n("Add &%1%2").tqarg((char)toupper(indicationType[0])).tqarg(strtoqstr(indicationType.substr(1)));
+    TQString n = i18n("Add &%1%2").arg((char)toupper(indicationType[0])).arg(strtoqstr(indicationType.substr(1)));
     return n;
 }
 

src/commands/notation/AddIndicationCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/notation/AddMarkCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -25,7 +23,7 @@
 
 #include "AddMarkCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
@@ -81,12 +79,12 @@ AddMarkCommand::getGlobalName(Mark markType)
     else if (markType == Marks::MordentLongInverted)
         m = i18n("Lon&g Inverted Mordent");
     else
-        m = i18n("&%1%2").tqarg(m[0].upper()).tqarg(m.right(m.length() - 1));
+        m = i18n("&%1%2").arg(m[0].upper()).arg(m.right(m.length() - 1));
     // FIXME: That last i18n has very little chance of working, unless
     // by some miracle the exact same string was translated elsewhere already
     // but we'll leave it as a warning
 
-    m = i18n("Add %1").tqarg(m);
+    m = i18n("Add %1").arg(m);
     return m;
 }
 

src/commands/notation/AddMarkCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/notation/AddSlashesCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/notation/AddSlashesCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -27,7 +24,7 @@
 #define _RG_NOTESMENUADDSLASHESCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/notation/AddTextMarkCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/notation/AddTextMarkCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -29,7 +26,7 @@
 #include "document/BasicSelectionCommand.h"
 #include <string>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/notation/AutoBeamCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/notation/AutoBeamCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -28,7 +25,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/notation/BeamCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/notation/BeamCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -28,7 +25,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/notation/BreakCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.

src/commands/notation/BreakCommand.h

@@ -1,6 +1,3 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.
@@ -28,7 +25,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/commands/notation/ChangeSlurPositionCommand.cpp

@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
 /*
     Rosegarden
     A MIDI and audio sequencer and musical notation editor.