diff options
Diffstat (limited to 'kcontrol')
| -rw-r--r-- | kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/kcontrol/toplevel.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/pics/cr16-app-kcmkicker.png | bin | 921 -> 568 bytes | |||
| -rw-r--r-- | kcontrol/pics/cr16-app-panel_settings.png | bin | 735 -> 635 bytes | |||
| -rw-r--r-- | kcontrol/pics/cr22-app-kcmkicker.png | bin | 1099 -> 1012 bytes | |||
| -rw-r--r-- | kcontrol/pics/cr32-app-kcmkicker.png | bin | 1707 -> 1632 bytes | |||
| -rw-r--r-- | kcontrol/pics/cr48-app-kcmkicker.png | bin | 2913 -> 2778 bytes | |||
| -rw-r--r-- | kcontrol/pics/cr64-app-kcmkicker.png | bin | 0 -> 4310 bytes | |||
| -rw-r--r-- | kcontrol/randr/tderandrtray.cpp | 10 | ||||
| -rw-r--r-- | kcontrol/tdefontinst/tdeio/KioFonts.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/tdefontinst/viewpart/FontViewPart.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/tdm/tdm-appear.cpp | 4 |
14 files changed, 13 insertions, 13 deletions
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp index f6227b90f..f29678e15 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <kurl.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include "ikwsopts.h" diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp index 78f84780c..fb816ef84 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include "ikwsopts.h" diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index 84f140a54..12c9a37b8 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -24,7 +24,7 @@ #include <kbugreport.h> #include <tdeaboutapplication.h> #include <tdemessagebox.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaction.h> #include <twin.h> #include <kiconloader.h> diff --git a/kcontrol/pics/cr16-app-kcmkicker.png b/kcontrol/pics/cr16-app-kcmkicker.png Binary files differindex 681263792..40ea57417 100644 --- a/kcontrol/pics/cr16-app-kcmkicker.png +++ b/kcontrol/pics/cr16-app-kcmkicker.png diff --git a/kcontrol/pics/cr16-app-panel_settings.png b/kcontrol/pics/cr16-app-panel_settings.png Binary files differindex 7df91bed1..2fe3f09b4 100644 --- a/kcontrol/pics/cr16-app-panel_settings.png +++ b/kcontrol/pics/cr16-app-panel_settings.png diff --git a/kcontrol/pics/cr22-app-kcmkicker.png b/kcontrol/pics/cr22-app-kcmkicker.png Binary files differindex 7a3b5c6a6..a9625465b 100644 --- a/kcontrol/pics/cr22-app-kcmkicker.png +++ b/kcontrol/pics/cr22-app-kcmkicker.png diff --git a/kcontrol/pics/cr32-app-kcmkicker.png b/kcontrol/pics/cr32-app-kcmkicker.png Binary files differindex 5a8c1d4f0..f9599d396 100644 --- a/kcontrol/pics/cr32-app-kcmkicker.png +++ b/kcontrol/pics/cr32-app-kcmkicker.png diff --git a/kcontrol/pics/cr48-app-kcmkicker.png b/kcontrol/pics/cr48-app-kcmkicker.png Binary files differindex 613dd6708..fcbb0b2ac 100644 --- a/kcontrol/pics/cr48-app-kcmkicker.png +++ b/kcontrol/pics/cr48-app-kcmkicker.png diff --git a/kcontrol/pics/cr64-app-kcmkicker.png b/kcontrol/pics/cr64-app-kcmkicker.png Binary files differnew file mode 100644 index 000000000..7be5b4513 --- /dev/null +++ b/kcontrol/pics/cr64-app-kcmkicker.png diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp index 1c95bd552..0506639e3 100644 --- a/kcontrol/randr/tderandrtray.cpp +++ b/kcontrol/randr/tderandrtray.cpp @@ -195,15 +195,15 @@ void KRandRSystemTray::reloadDisplayConfiguration() if (RR_Disconnected == randr_screen_info->outputs[i]->info->connection) { continue; } - + // Activate this output randr_screen_info->cur_crtc = randr_screen_info->outputs[i]->cur_crtc; randr_screen_info->cur_output = randr_screen_info->outputs[i]; randr_screen_info->cur_output->auto_set = 1; randr_screen_info->cur_output->off_set = 0; output_auto (randr_screen_info, randr_screen_info->cur_output); - i=main_low_apply(randr_screen_info); - + main_low_apply(randr_screen_info); + if (randr_screen_info->outputs[i]->cur_crtc) { // Output successfully activated! set_primary_output(randr_screen_info, randr_screen_info->cur_output->id); @@ -879,7 +879,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter) randr_screen_info->cur_output->auto_set = 1; randr_screen_info->cur_output->off_set = 0; output_auto (randr_screen_info, randr_screen_info->cur_output); - i=main_low_apply(randr_screen_info); + main_low_apply(randr_screen_info); if (!randr_screen_info->outputs[parameter]->cur_crtc) { output_name = randr_screen_info->outputs[parameter]->info->name; @@ -894,7 +894,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter) randr_screen_info->cur_output->auto_set = 0; randr_screen_info->cur_output->off_set = 1; output_off(randr_screen_info, randr_screen_info->cur_output); - i=main_low_apply(randr_screen_info); + main_low_apply(randr_screen_info); findPrimaryDisplay(); refresh(); diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.cpp b/kcontrol/tdefontinst/tdeio/KioFonts.cpp index afed0d441..753e412cd 100644 --- a/kcontrol/tdefontinst/tdeio/KioFonts.cpp +++ b/kcontrol/tdefontinst/tdeio/KioFonts.cpp @@ -56,7 +56,7 @@ #include <tqdir.h> #include <tqdatastream.h> #include <tqregexp.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <klargefile.h> #include <tdetempfile.h> #include <tdesu/su.h> diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp index c2437ef1a..b3f3b1c94 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp @@ -45,7 +45,7 @@ #include <tqstringlist.h> #include <tqtimer.h> #include <tdeio/netaccess.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdemessagebox.h> #include <knuminput.h> #include <kstdaction.h> diff --git a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp index 90b65eebf..a2ea58602 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp @@ -30,7 +30,7 @@ #include "FontViewPart.h" #include <kdebug.h> #include <tdeaboutdata.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <assert.h> extern "C" diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp index c057867d1..9ad28eacf 100644 --- a/kcontrol/tdm/tdm-appear.cpp +++ b/kcontrol/tdm/tdm-appear.cpp @@ -252,7 +252,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) hbox2->setColStretch(1, 1); hbox2->addWidget(sakbox, 1, 0); if (getuid() == 0 && config->checkConfigFilesWritable( true )) { - if (system(KDE_BINDIR "/tsak checkdeps") != 0) { + if (system(TDE_BINDIR "/tsak checkdeps") != 0) { sakbox->setEnabled(false); sakwarning = new TQLabel( i18n("Secure Attention Key support is not available on your system. Please check for the presence of evdev and uinput."), group ); hbox2->addWidget(sakwarning, 2, 0); @@ -494,7 +494,7 @@ void TDMAppearanceWidget::save() // Enable/disable tsak as needed if (sakbox->isChecked()) { - system(KDE_BINDIR "/tsak"); + system(TDE_BINDIR "/tsak"); } else { // Get PID |
