diff options
Diffstat (limited to 'kmix')
| -rw-r--r-- | kmix/dialogselectmaster.cpp | 4 | ||||
| -rw-r--r-- | kmix/kmix.cpp | 12 | ||||
| -rw-r--r-- | kmix/kmixapplet.cpp | 4 | ||||
| -rw-r--r-- | kmix/kmixctrl.cpp | 2 | ||||
| -rw-r--r-- | kmix/kmixdockwidget.cpp | 10 | ||||
| -rw-r--r-- | kmix/kmixtoolbox.cpp | 2 | ||||
| -rw-r--r-- | kmix/main.cpp | 2 | ||||
| -rw-r--r-- | kmix/mdwenum.cpp | 2 | ||||
| -rw-r--r-- | kmix/mdwslider.cpp | 2 | ||||
| -rw-r--r-- | kmix/mdwswitch.cpp | 2 | ||||
| -rw-r--r-- | kmix/mixdevicewidget.cpp | 2 |
11 files changed, 22 insertions, 22 deletions
diff --git a/kmix/dialogselectmaster.cpp b/kmix/dialogselectmaster.cpp index abeca6e4..34ad8acd 100644 --- a/kmix/dialogselectmaster.cpp +++ b/kmix/dialogselectmaster.cpp @@ -102,8 +102,8 @@ void DialogSelectMaster::createWidgets(Mixer *ptr_mixer) void DialogSelectMaster::show(Mixer *curr_mixer) { - kapp->config()->setGroup(0); - bool useDefaultMaster = kapp->config()->readBoolEntry("UseDefaultMaster", true); + tdeApp->config()->setGroup(0); + bool useDefaultMaster = tdeApp->config()->readBoolEntry("UseDefaultMaster", true); if (useDefaultMaster) { m_defaultMaster->setChecked(true); diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp index 8db11212..21fa814b 100644 --- a/kmix/kmix.cpp +++ b/kmix/kmix.cpp @@ -49,7 +49,7 @@ #include <khelpmenu.h> #include <kdebug.h> #include <tdeaccel.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <kkeydialog.h> #include <tdeconfigdialog.h> @@ -97,7 +97,7 @@ KMixWindow::KMixWindow() { hide(); } - connect( kapp, TQ_SIGNAL( aboutToQuit()), TQ_SLOT( saveSettings()) ); + connect( tdeApp, TQ_SIGNAL( aboutToQuit()), TQ_SLOT( saveSettings()) ); } @@ -255,7 +255,7 @@ KMixWindow::loadConfig() if (a) a->setChecked( KMixSettings::menubar() ); // restore window size and position - if ( !kapp->isRestored() ) // done by the session manager otherwise + if ( !tdeApp->isRestored() ) // done by the session manager otherwise { TQSize size = KMixSettings::size(); if(!size.isEmpty()) @@ -333,7 +333,7 @@ KMixWindow::initMixerWidgets() bool KMixWindow::queryClose ( ) { - if ( KMixSettings::allowDocking() && !kapp->sessionSaving() ) + if ( KMixSettings::allowDocking() && !tdeApp->sessionSaving() ) { hide(); return false; @@ -345,7 +345,7 @@ KMixWindow::queryClose ( ) void KMixWindow::quit() { - kapp->quit(); + tdeApp->quit(); } @@ -449,7 +449,7 @@ KMixWindow::applyPrefs() this->setUpdatesEnabled(true); this->repaint(); // make KMix look fast (saveConfig() often uses several seconds) - kapp->processEvents(); + tdeApp->processEvents(); saveConfig(); } diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp index 020a27b6..05c92736 100644 --- a/kmix/kmixapplet.cpp +++ b/kmix/kmixapplet.cpp @@ -44,13 +44,13 @@ #include <tdeconfig.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <tdeglobalsettings.h> #include <kiconloader.h> #include <kinputdialog.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // // KMix #include "colorwidget.h" diff --git a/kmix/kmixctrl.cpp b/kmix/kmixctrl.cpp index c3bfd55a..40472212 100644 --- a/kmix/kmixctrl.cpp +++ b/kmix/kmixctrl.cpp @@ -24,7 +24,7 @@ #include <tdeaboutdata.h> #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <kdebug.h> #include <tqptrlist.h> diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp index fba30421..6baf4666 100644 --- a/kmix/kmixdockwidget.cpp +++ b/kmix/kmixdockwidget.cpp @@ -34,7 +34,7 @@ #include <tdelocale.h> #include <tdepopupmenu.h> #include <tdeglobalsettings.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemainwindow.h> #include <tqapplication.h> @@ -73,7 +73,7 @@ KMixDockWidget::KMixDockWidget( Mixer *mixer, TQWidget *parent, const char *name } createActions(); createMasterVolWidget(); - connect(this, TQ_SIGNAL(quitSelected()), kapp, TQ_SLOT(quitExtended())); + connect(this, TQ_SIGNAL(quitSelected()), tdeApp, TQ_SLOT(quitExtended())); TDEGlobal::dirs()->addResourceDir("icons_crystal", locate("appdata", "pics/crystal/")); TDEGlobal::dirs()->addResourceDir("icons_oldcrystal", locate("appdata", "pics/oldcrystal/")); @@ -220,8 +220,8 @@ void KMixDockWidget::selectMaster() void KMixDockWidget::handleNewMaster(bool defaultMaster, int soundcard_id, const TQString &channel_id) { //kdDebug(67100) << "KMixDockWidget::handleNewMaster() default master=" << defaultMaster << ", soundcard_id=" << soundcard_id << ", channel_id=" << channel_id << endl; - kapp->config()->setGroup(0); - kapp->config()->writeEntry("UseDefaultMaster", defaultMaster); + tdeApp->config()->setGroup(0); + tdeApp->config()->writeEntry("UseDefaultMaster", defaultMaster); Mixer *mixer; TQString channel = TQString::null; if (defaultMaster) @@ -399,7 +399,7 @@ TQString KMixDockWidget::getIconPath(TQStringList fallback) { if (iconTheme == KMixSettings::EnumIconTheme::System) { - TQString iconPath = kapp->iconLoader()->iconPath((*it), TDEIcon::Panel, true); + TQString iconPath = tdeApp->iconLoader()->iconPath((*it), TDEIcon::Panel, true); if (!iconPath.isNull()) { return iconPath; diff --git a/kmix/kmixtoolbox.cpp b/kmix/kmixtoolbox.cpp index 7e0d57c4..9376a69d 100644 --- a/kmix/kmixtoolbox.cpp +++ b/kmix/kmixtoolbox.cpp @@ -25,7 +25,7 @@ #include "tqstring.h" //#include <kdebug.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <tdelocale.h> #include "mdwslider.h" diff --git a/kmix/main.cpp b/kmix/main.cpp index 1372de92..9a8ba9f4 100644 --- a/kmix/main.cpp +++ b/kmix/main.cpp @@ -23,7 +23,7 @@ #include <tdeaboutdata.h> #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "KMixApp.h" #include "version.h" diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp index 5a685772..23846644 100644 --- a/kmix/mdwenum.cpp +++ b/kmix/mdwenum.cpp @@ -31,7 +31,7 @@ #include <tdeaction.h> #include <tdepopupmenu.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <kkeydialog.h> #include <kdebug.h> diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp index c8302c54..acdcb2b6 100644 --- a/kmix/mdwslider.cpp +++ b/kmix/mdwslider.cpp @@ -25,7 +25,7 @@ #include <tdeconfig.h> #include <tdeaction.h> #include <tdepopupmenu.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <kkeydialog.h> #include <kdebug.h> diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp index 2fcd228c..8b62e6c1 100644 --- a/kmix/mdwswitch.cpp +++ b/kmix/mdwswitch.cpp @@ -30,7 +30,7 @@ #include <tdeconfig.h> #include <tdeaction.h> #include <tdepopupmenu.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <kkeydialog.h> #include <kdebug.h> diff --git a/kmix/mixdevicewidget.cpp b/kmix/mixdevicewidget.cpp index 5fbfac2a..81d7c4ed 100644 --- a/kmix/mixdevicewidget.cpp +++ b/kmix/mixdevicewidget.cpp @@ -25,7 +25,7 @@ #include <tdeconfig.h> #include <tdeaction.h> #include <tdepopupmenu.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <kkeydialog.h> #include <kdebug.h> |