summaryrefslogtreecommitdiffstats
path: root/kmix
diff options
context:
space:
mode:
Diffstat (limited to 'kmix')
-rw-r--r--kmix/kmix.cpp2
-rw-r--r--kmix/kmix.h4
-rw-r--r--kmix/kmixapplet.cpp14
-rw-r--r--kmix/kmixctrl.cpp4
-rw-r--r--kmix/kmixtoolbox.cpp4
-rw-r--r--kmix/ksmallslider.cpp4
-rw-r--r--kmix/mdwenum.h2
-rw-r--r--kmix/mdwslider.h2
-rw-r--r--kmix/mdwswitch.h2
-rw-r--r--kmix/mixdevicewidget.cpp4
-rw-r--r--kmix/mixdevicewidget.h6
-rw-r--r--kmix/viewswitches.cpp4
12 files changed, 26 insertions, 26 deletions
diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp
index 65c6f560..c20c9443 100644
--- a/kmix/kmix.cpp
+++ b/kmix/kmix.cpp
@@ -119,7 +119,7 @@ KMixWindow::initActions()
(void) new KAction( i18n( "Hardware &Information" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotHWInfo() ), actionCollection(), "hwinfo" );
(void) new KAction( i18n( "Hide Mixer Window" ), Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(hide()), actionCollection(), "hide_kmixwindow" );
- m_globalAccel = new KGlobalAccel( TQT_TQOBJECT(this) );
+ m_globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this) );
m_globalAccel->insert( "Increase volume", i18n( "Increase Volume of Master Channel"), TQString(),
KShortcut(TQString("XF86AudioRaiseVolume")), KShortcut(TQString("XF86AudioRaiseVolume")), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) );
m_globalAccel->insert( "Decrease volume", i18n( "Decrease Volume of Master Channel"), TQString(),
diff --git a/kmix/kmix.h b/kmix/kmix.h
index b116af22..870fcb2e 100644
--- a/kmix/kmix.h
+++ b/kmix/kmix.h
@@ -38,7 +38,7 @@ class TQWidgetStack;
#include <kmainwindow.h>
class KAccel;
-class KGlobalAccel;
+class TDEGlobalAccel;
class KComboBox;
class KMixerWidget;
class KMixerPrefWidget;
@@ -92,7 +92,7 @@ KMixWindow : public KMainWindow
private:
KAccel *m_keyAccel;
- KGlobalAccel *m_globalAccel;
+ TDEGlobalAccel *m_globalAccel;
TQPopupMenu *m_fileMenu;
TQPopupMenu *m_viewMenu;
TQPopupMenu *m_helpMenu;
diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp
index be672b2c..63b376e7 100644
--- a/kmix/kmixapplet.cpp
+++ b/kmix/kmixapplet.cpp
@@ -68,7 +68,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
- KGlobal::locale()->insertCatalogue("kmix");
+ TDEGlobal::locale()->insertCatalogue("kmix");
return new KMixApplet(configFile, KPanelApplet::Normal,
parent, "kmixapplet");
}
@@ -77,8 +77,8 @@ extern "C"
int KMixApplet::s_instCount = 0;
//<Mixer> KMixApplet::Mixer::mixers();
-static const TQColor highColor = KGlobalSettings::baseColor();
-static const TQColor lowColor = KGlobalSettings::highlightColor();
+static const TQColor highColor = TDEGlobalSettings::baseColor();
+static const TQColor lowColor = TDEGlobalSettings::highlightColor();
static const TQColor backColor = "#000000";
static const TQColor mutedHighColor = "#FFFFFF";
static const TQColor mutedLowColor = "#808080";
@@ -172,7 +172,7 @@ KMixApplet::KMixApplet( const TQString& configFile, Type t,
s_instCount++;
kdDebug(67100) << "KMixApplet::KMixApplet instancing Applet, s_instCount="<< s_instCount << endl;
- KGlobal::dirs()->addResourceType( "appicon", KStandardDirs::kde_default("data") + "kmix/pics" );
+ TDEGlobal::dirs()->addResourceType( "appicon", KStandardDirs::kde_default("data") + "kmix/pics" );
loadConfig();
@@ -521,9 +521,9 @@ void KMixApplet::applyPreferences()
void KMixApplet::paletteChange ( const TQPalette &) {
if ( ! _customColors ) {
// We take over Colors from paletteChange(), if the user has not set custom colors.
- // ignore the given TQPalette and use the values from KGlobalSettings instead
- _colors.high = KGlobalSettings::highlightColor();
- _colors.low = KGlobalSettings::baseColor();
+ // ignore the given TQPalette and use the values from TDEGlobalSettings instead
+ _colors.high = TDEGlobalSettings::highlightColor();
+ _colors.low = TDEGlobalSettings::baseColor();
_colors.back = backColor;
setColors( _colors );
}
diff --git a/kmix/kmixctrl.cpp b/kmix/kmixctrl.cpp
index 60c27c48..8cf04523 100644
--- a/kmix/kmixctrl.cpp
+++ b/kmix/kmixctrl.cpp
@@ -73,7 +73,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
if ( args->isSet("restore") )
{
for (Mixer *mixer=Mixer::mixers().first(); mixer!=0; mixer=Mixer::mixers().next()) {
- mixer->volumeLoad( KGlobal::config() );
+ mixer->volumeLoad( TDEGlobal::config() );
}
}
@@ -81,7 +81,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
if ( args->isSet("save") )
{
for (Mixer *mixer=Mixer::mixers().first(); mixer!=0; mixer=Mixer::mixers().next())
- mixer->volumeSave( KGlobal::config() );
+ mixer->volumeSave( TDEGlobal::config() );
}
MixerToolBox::deinitMixer();
diff --git a/kmix/kmixtoolbox.cpp b/kmix/kmixtoolbox.cpp
index 02292a89..397aa320 100644
--- a/kmix/kmixtoolbox.cpp
+++ b/kmix/kmixtoolbox.cpp
@@ -142,7 +142,7 @@ void KMixToolBox::loadConfig(TQPtrList<TQWidget> &mdws, KConfig *config, const T
}
mdw->setDisabled( !config->readBoolEntry("Show", true) );
- KGlobalAccel *keys=mdw->keys();
+ TDEGlobalAccel *keys=mdw->keys();
if ( keys )
{
TQString devgrpkeys;
@@ -200,7 +200,7 @@ void KMixToolBox::saveConfig(TQPtrList<TQWidget> &mdws, KConfig *config, const T
If you think about this aspect more deeply, you will find out that this is the case already
today with "kmixapplet" and "kmix main application". It would really nice to rework this.
*/
- KGlobalAccel *keys=mdw->keys();
+ TDEGlobalAccel *keys=mdw->keys();
if (keys) {
TQString devgrpkeys;
devgrpkeys.sprintf( "%s.%s.Dev%i.keys", viewPrefix.ascii(), grp.ascii(), n );
diff --git a/kmix/ksmallslider.cpp b/kmix/ksmallslider.cpp
index b1f6569e..08bee03b 100644
--- a/kmix/ksmallslider.cpp
+++ b/kmix/ksmallslider.cpp
@@ -473,9 +473,9 @@ void KSmallSlider::paletteChange ( const TQPalette &) {
setColors(mutedLowColor2, mutedHighColor2, backColor2 );
}
else {
- // ignore the TQPalette and use the values from KGlobalSettings instead
+ // ignore the TQPalette and use the values from TDEGlobalSettings instead
//const TQColorGroup& qcg = palette().active();
- setColors(KGlobalSettings::baseColor(), KGlobalSettings::highlightColor(), backColor2 );
+ setColors(TDEGlobalSettings::baseColor(), TDEGlobalSettings::highlightColor(), backColor2 );
}
}
*/
diff --git a/kmix/mdwenum.h b/kmix/mdwenum.h
index 28415133..b25b116b 100644
--- a/kmix/mdwenum.h
+++ b/kmix/mdwenum.h
@@ -31,7 +31,7 @@ class TQBoxLayout;
class KAction;
class KActionCollection;
class KComboBox;
-class KGlobalAccel;
+class TDEGlobalAccel;
class MixDevice;
class Mixer;
diff --git a/kmix/mdwslider.h b/kmix/mdwslider.h
index 0bd8c059..0f8c70a5 100644
--- a/kmix/mdwslider.h
+++ b/kmix/mdwslider.h
@@ -42,7 +42,7 @@ class KLedButton;
class KAction;
class KActionCollection;
class KSmallSlider;
-class KGlobalAccel;
+class TDEGlobalAccel;
class MixDevice;
class VerticalText;
diff --git a/kmix/mdwswitch.h b/kmix/mdwswitch.h
index 442ef174..d584bda4 100644
--- a/kmix/mdwswitch.h
+++ b/kmix/mdwswitch.h
@@ -40,7 +40,7 @@ class KLedButton;
class KAction;
class KActionCollection;
class KSmallSlider;
-class KGlobalAccel;
+class TDEGlobalAccel;
class MixDevice;
class VerticalText;
diff --git a/kmix/mixdevicewidget.cpp b/kmix/mixdevicewidget.cpp
index f90a9455..9096c2c0 100644
--- a/kmix/mixdevicewidget.cpp
+++ b/kmix/mixdevicewidget.cpp
@@ -59,7 +59,7 @@ MixDeviceWidget::MixDeviceWidget(Mixer *mixer, MixDevice* md,
m_disabled( false ), _orientation( orientation ), m_small( small )
{
_mdwActions = new KActionCollection( this );
- m_keys = new KGlobalAccel( TQT_TQOBJECT(this), "Keys" );
+ m_keys = new TDEGlobalAccel( TQT_TQOBJECT(this), "Keys" );
}
MixDeviceWidget::~MixDeviceWidget()
@@ -79,7 +79,7 @@ bool MixDeviceWidget::isDisabled() const
}
-KGlobalAccel *MixDeviceWidget::keys( void )
+TDEGlobalAccel *MixDeviceWidget::keys( void )
{
return m_keys;
}
diff --git a/kmix/mixdevicewidget.h b/kmix/mixdevicewidget.h
index fe35c482..c9c62d6a 100644
--- a/kmix/mixdevicewidget.h
+++ b/kmix/mixdevicewidget.h
@@ -43,7 +43,7 @@ class KLedButton;
class KAction;
class KActionCollection;
class KSmallSlider;
-class KGlobalAccel;
+class TDEGlobalAccel;
class MixDevice;
class VerticalText;
@@ -80,7 +80,7 @@ public:
virtual void setTicks( bool ) {};
virtual void setValueStyle( ValueStyle ) {};
- virtual KGlobalAccel *keys(void);
+ virtual TDEGlobalAccel *keys(void);
public slots:
virtual void setDisabled( bool value );
@@ -103,7 +103,7 @@ protected:
Mixer* m_mixer;
MixDevice* m_mixdevice;
KActionCollection* _mdwActions;
- KGlobalAccel* m_keys;
+ TDEGlobalAccel* m_keys;
ViewBase* m_mixerwidget;
bool m_disabled;
Qt::Orientation _orientation;
diff --git a/kmix/viewswitches.cpp b/kmix/viewswitches.cpp
index 15b555ac..2bb39a6d 100644
--- a/kmix/viewswitches.cpp
+++ b/kmix/viewswitches.cpp
@@ -170,8 +170,8 @@ void ViewSwitches::configurationUpdate() {
mdw->setBackgroundMode(PaletteBackground);
}
else {
- // !! Should use KGlobalSettings::alternateBackgroundColor()
- // or KGlobalSettings::calculateAlternateBackgroundColor() instead.
+ // !! Should use TDEGlobalSettings::alternateBackgroundColor()
+ // or TDEGlobalSettings::calculateAlternateBackgroundColor() instead.
mdw->setBackgroundMode( PaletteBase );
}
backGoundModeToggler = !backGoundModeToggler;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 06:31:53 +0000