summaryrefslogtreecommitdiffstats
path: root/kpersonalizer
diff options
context:
space:
mode:
Diffstat (limited to 'kpersonalizer')
-rw-r--r--kpersonalizer/CMakeLists.txt2
-rw-r--r--kpersonalizer/README6
-rw-r--r--kpersonalizer/kcountrypage.cpp4
-rw-r--r--kpersonalizer/kcountrypage.h2
-rw-r--r--kpersonalizer/keyecandypage.cpp2
-rw-r--r--kpersonalizer/keyecandypage.h2
-rw-r--r--kpersonalizer/keyecandypagedlg.ui4
-rw-r--r--kpersonalizer/kospage.h2
-rw-r--r--kpersonalizer/kospagedlg.ui4
-rw-r--r--kpersonalizer/kpersonalizer.cpp10
-rw-r--r--kpersonalizer/kpersonalizer.h2
-rw-r--r--kpersonalizer/krefinepage.cpp2
-rw-r--r--kpersonalizer/krefinepage.h2
-rw-r--r--kpersonalizer/ksysinfo.cpp30
-rw-r--r--kpersonalizer/stylepreview.ui4
-rw-r--r--kpersonalizer/stylepreview.ui.h4
-rw-r--r--kpersonalizer/tdestylepage.cpp4
-rw-r--r--kpersonalizer/tdestylepage.h2
18 files changed, 58 insertions, 30 deletions
diff --git a/kpersonalizer/CMakeLists.txt b/kpersonalizer/CMakeLists.txt
index 19c3a6698..6fe020c82 100644
--- a/kpersonalizer/CMakeLists.txt
+++ b/kpersonalizer/CMakeLists.txt
@@ -40,6 +40,6 @@ tde_add_executable( kpersonalizer AUTOMOC
kpersonalizer.cpp main.cpp kfindlanguage.cpp
kcountrypagedlg.ui kospagedlg.ui keyecandypagedlg.ui
tdestylepagedlg.ui krefinepagedlg.ui ksysinfo.cpp
- LINK tdeio-shared
+ LINK tdeio-shared ${KSTAT_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kpersonalizer/README b/kpersonalizer/README
index b93d9d15d..14cbb63ca 100644
--- a/kpersonalizer/README
+++ b/kpersonalizer/README
@@ -39,8 +39,8 @@ that don't require much background-knowledge and tries to guess a set
of configuration-settings which fit the users needs best.
Layout: KPersonalizer consists of a window which is not set fullscreen.
-This has the advantage that the user sees on the fly which settings he has
-changed and can step back as he sees that something doesn't fit.
+This has the advantage that the user sees on the fly which settings they
+have changed and can step back as they see that something doesn't fit.
On the left of each dialog there is a decorative 170x430-pixel-bitmap which
sort of describes the step in a graphical manner.
@@ -204,7 +204,7 @@ There is a preview for each theme.
Step 5: Refinement
==============
-The user is told how he can start KPersonalizer again if the user changes his
+The user is told how they can start KPersonalizer again if they change their
mind on a certain setting later and the advanced user may launch kcontrol to
refine certain settings.
diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp
index cec71bae8..0384ff2b8 100644
--- a/kpersonalizer/kcountrypage.cpp
+++ b/kpersonalizer/kcountrypage.cpp
@@ -37,8 +37,8 @@ KCountryPage::KCountryPage(TQWidget *parent, const char *name ) : KCountryPageDl
px_introSidebar->setPixmap(UserIcon("step1.png"));
- connect(cb_country, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(setLangForCountry(const TQString &)));
- connect(cb_language, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(setLanguageChanged()));
+ connect(cb_country, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(setLangForCountry(const TQString &)));
+ connect(cb_language, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(setLanguageChanged()));
// naturally, the language is not changed on startup
b_savedLanguageChanged = false;
diff --git a/kpersonalizer/kcountrypage.h b/kpersonalizer/kcountrypage.h
index 758decbb3..083937fd6 100644
--- a/kpersonalizer/kcountrypage.h
+++ b/kpersonalizer/kcountrypage.h
@@ -29,7 +29,7 @@ class KFindLanguage;
*/
class KCountryPage : public KCountryPageDlg {
- Q_OBJECT
+ TQ_OBJECT
public:
KCountryPage(TQWidget *parent=0, const char *name=0);
~KCountryPage();
diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp
index fb0f446d7..9c1fb7765 100644
--- a/kpersonalizer/keyecandypage.cpp
+++ b/kpersonalizer/keyecandypage.cpp
@@ -689,7 +689,7 @@ void KEyeCandyPage::getUserDefaults(){
st_UserWallpaper.CommonDesktop = kdesktopconf->readBoolEntry("CommonDesktop", true);
kdesktopconf->setGroup("Desktop0"); // we only need to set one desktop
st_UserWallpaper.MultiWallpaperMode = kdesktopconf->readEntry("MultiWallpaperMode", "NoMulti");
- st_UserWallpaper.WallpaperMode = kdesktopconf->readEntry("WallpaperMode", "Scaled");
+ st_UserWallpaper.WallpaperMode = kdesktopconf->readEntry("WallpaperMode", "ScaledAndCrop");
st_UserWallpaper.Wallpaper = kdesktopconf->readPathEntry("Wallpaper", "NoWallpaper");
deskbgimage = kdesktopconf->readPathEntry("Wallpaper", DEFAULT_WALLPAPER);
// Wallpaper-User-Defaults (END)
diff --git a/kpersonalizer/keyecandypage.h b/kpersonalizer/keyecandypage.h
index 63889a67c..0601a6736 100644
--- a/kpersonalizer/keyecandypage.h
+++ b/kpersonalizer/keyecandypage.h
@@ -29,7 +29,7 @@ class KSysInfo;
*/
class KEyeCandyPage : public KEyeCandyPageDlg {
- Q_OBJECT
+ TQ_OBJECT
public:
KEyeCandyPage(TQWidget *parent=0, const char *name=0);
~KEyeCandyPage();
diff --git a/kpersonalizer/keyecandypagedlg.ui b/kpersonalizer/keyecandypagedlg.ui
index 1a9c7e570..79835faf4 100644
--- a/kpersonalizer/keyecandypagedlg.ui
+++ b/kpersonalizer/keyecandypagedlg.ui
@@ -251,10 +251,10 @@ If you have a fast, new processor, you might want to turn them all on, but for t
<slot>slotEyeCandySliderMoved(int)</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot>slotEyeCandyShowDetails(bool)</slot>
<slot>slotEyeCandySliderMoved(int)</slot>
-</Q_SLOTS>
+</slots>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
<include location="global" impldecl="in implementation">tdelistview.h</include>
diff --git a/kpersonalizer/kospage.h b/kpersonalizer/kospage.h
index 2797f4572..8d3d35142 100644
--- a/kpersonalizer/kospage.h
+++ b/kpersonalizer/kospage.h
@@ -26,7 +26,7 @@
*/
class KOSPage : public KOSPageDlg {
- Q_OBJECT
+ TQ_OBJECT
public:
KOSPage(TQWidget *parent=0, const char *name=0);
~KOSPage();
diff --git a/kpersonalizer/kospagedlg.ui b/kpersonalizer/kospagedlg.ui
index 30edfeea9..45e2de8b5 100644
--- a/kpersonalizer/kospagedlg.ui
+++ b/kpersonalizer/kospagedlg.ui
@@ -207,12 +207,12 @@ Trinity allows you to customize its behavior according to your needs.</string>
<slot>slotMacDescription()</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot>slotWindowsDescription()</slot>
<slot>slotKDEDescription()</slot>
<slot>slotMacDescription()</slot>
<slot>slotUnixDescription()</slot>
-</Q_SLOTS>
+</slots>
<includes>
<include location="local" impldecl="in implementation">kdialog.h</include>
</includes>
diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp
index 86b0a5b4a..cef8619ea 100644
--- a/kpersonalizer/kpersonalizer.cpp
+++ b/kpersonalizer/kpersonalizer.cpp
@@ -90,9 +90,9 @@ KPersonalizer::KPersonalizer(TQWidget *parent, const char *name)
locale = new TDELocale("kpersonalizer");
locale->setLanguage(TDELocale::defaultLanguage());
- connect(ospage, TQT_SIGNAL(selectedOS(const TQString&)), stylepage, TQT_SLOT(presetStyle(const TQString&)));
- connect(ospage, TQT_SIGNAL(selectedOS(const TQString&)), eyecandy, TQT_SLOT(slotPresetSlider(const TQString&)));
- connect(refinepage->pb_kcontrol, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()));
+ connect(ospage, TQ_SIGNAL(selectedOS(const TQString&)), stylepage, TQ_SLOT(presetStyle(const TQString&)));
+ connect(ospage, TQ_SIGNAL(selectedOS(const TQString&)), eyecandy, TQ_SLOT(slotPresetSlider(const TQString&)));
+ connect(refinepage->pb_kcontrol, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()));
setPosition();
@@ -125,7 +125,7 @@ void KPersonalizer::next() {
else if(currentPage()==eyecandy){
eye_dirty=true; // set the dirty flag, changes done that need reverting
eyecandy->save();
- TQTimer::singleShot(0, this, TQT_SLOT(slotNext()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotNext()));
}
else if(currentPage()==stylepage){
style_dirty=true; // set the dirty flag, changes done that need reverting
@@ -215,7 +215,7 @@ void KPersonalizer::slotRestart() {
}
void KPersonalizer::delayedRestart() {
- TQTimer::singleShot(0, this, TQT_SLOT(slotRestart()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotRestart()));
}
/** this session is restarted, so we want to start with ospage */
diff --git a/kpersonalizer/kpersonalizer.h b/kpersonalizer/kpersonalizer.h
index 78ff71ee4..76faaae0f 100644
--- a/kpersonalizer/kpersonalizer.h
+++ b/kpersonalizer/kpersonalizer.h
@@ -37,7 +37,7 @@ class KRefinePage;
/** KPersonalizer is the base class of the project */
class KPersonalizer : public KWizard {
- Q_OBJECT
+ TQ_OBJECT
public:
/** construtor */
KPersonalizer(TQWidget* parent=0, const char *name=0);
diff --git a/kpersonalizer/krefinepage.cpp b/kpersonalizer/krefinepage.cpp
index 568967690..32c7370ae 100644
--- a/kpersonalizer/krefinepage.cpp
+++ b/kpersonalizer/krefinepage.cpp
@@ -28,7 +28,7 @@
KRefinePage::KRefinePage(TQWidget *parent, const char *name ) : KRefinePageDlg(parent,name) {
px_finishSidebar->setPixmap(UserIcon("step5.png"));
- connect( pb_kcontrol, TQT_SIGNAL(clicked()), TQT_SLOT(startKControl()) );
+ connect( pb_kcontrol, TQ_SIGNAL(clicked()), TQ_SLOT(startKControl()) );
if( KPersonalizer::beforeSession()) {
pb_kcontrol->hide();
lb_kcontrol->hide();
diff --git a/kpersonalizer/krefinepage.h b/kpersonalizer/krefinepage.h
index 4065b5a28..e0442f88b 100644
--- a/kpersonalizer/krefinepage.h
+++ b/kpersonalizer/krefinepage.h
@@ -25,7 +25,7 @@
*/
class KRefinePage : public KRefinePageDlg {
- Q_OBJECT
+ TQ_OBJECT
public:
KRefinePage(TQWidget *parent=0, const char *name=0);
~KRefinePage();
diff --git a/kpersonalizer/ksysinfo.cpp b/kpersonalizer/ksysinfo.cpp
index 20a089b8f..551dad3f8 100644
--- a/kpersonalizer/ksysinfo.cpp
+++ b/kpersonalizer/ksysinfo.cpp
@@ -235,8 +235,36 @@ TQFont KSysInfo::getFixedWidthFont(){
///////////////////
///////////////////
-//#elif defined(__svr4__) && defined(sun)
+#elif defined(Q_OS_SOLARIS)
///////////////////
+#include <kstat.h>
+
+ void KSysInfo::initHWInfo() {
+ kstat_ctl_t *kctl;
+ kstat_t *ksp;
+ kstat_named_t *kdata;
+
+ m_cpu_speed = 0;
+ /* cpu_info:0:cpu_info0:current_clock_Hz */
+
+ kctl = kstat_open();
+ if (kctl == NULL)
+ return;
+ if (kstat_chain_update(kctl) != 0)
+ goto out;
+ ksp = kstat_lookup(kctl, "cpu_info", 0, "cpu_info0");
+ if (ksp == NULL)
+ goto out;
+ if (kstat_read(kctl, ksp, NULL) == -1 )
+ goto out;
+
+ kdata = (kstat_named_t *)kstat_data_lookup(ksp,
+ "clock_Hz");
+ if (kdata != NULL)
+ m_cpu_speed = kdata->value.ui64;
+ out:
+ kstat_close(kctl);
+ }
///////////////////
//#elif __svr4__
diff --git a/kpersonalizer/stylepreview.ui b/kpersonalizer/stylepreview.ui
index 7e132c4c7..628241ac7 100644
--- a/kpersonalizer/stylepreview.ui
+++ b/kpersonalizer/stylepreview.ui
@@ -176,10 +176,10 @@
<include location="local" impldecl="in implementation">stylepreview.ui.h</include>
<include location="local" impldecl="in implementation">kdialog.h</include>
</includes>
-<Q_SLOTS>
+<slots>
<slot>init()</slot>
<slot returnType="bool">eventFilter( TQObject * obj, TQEvent * ev )</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/kpersonalizer/stylepreview.ui.h b/kpersonalizer/stylepreview.ui.h
index a36023fd0..b4c626221 100644
--- a/kpersonalizer/stylepreview.ui.h
+++ b/kpersonalizer/stylepreview.ui.h
@@ -41,14 +41,14 @@ void StylePreview::init()
{
// Ensure that the user can't toy with the child widgets.
// Method borrowed from Qt's qtconfig.
- TQObjectList* l = queryList(TQWIDGET_OBJECT_NAME_STRING);
+ TQObjectList* l = queryList("TQWidget");
TQObjectListIt it(*l);
TQObject* obj;
while ((obj = it.current()) != 0)
{
++it;
obj->installEventFilter(this);
- ((TQWidget*)obj)->setFocusPolicy(TQ_NoFocus);
+ ((TQWidget*)obj)->setFocusPolicy(TQWidget::NoFocus);
}
delete l;
}
diff --git a/kpersonalizer/tdestylepage.cpp b/kpersonalizer/tdestylepage.cpp
index 5c85f402c..2fd4a8419 100644
--- a/kpersonalizer/tdestylepage.cpp
+++ b/kpersonalizer/tdestylepage.cpp
@@ -75,8 +75,8 @@ TDEStylePage::TDEStylePage(TQWidget *parent, const char *name ) : TDEStylePageDl
platinum->setText( 0, i18n( "Platinum" ) );
platinum->setText( 1, i18n( "The platinum style" ) );
- connect(klv_styles, TQT_SIGNAL(selectionChanged()),
- this, TQT_SLOT(slotCurrentChanged()));
+ connect(klv_styles, TQ_SIGNAL(selectionChanged()),
+ this, TQ_SLOT(slotCurrentChanged()));
// Note: if the default is changed here it needs to be changed in tdebase/twin/plugins.cpp
// and tdebase/twin/kcmtwin/twindecoration/twindecoration.cpp as well.
diff --git a/kpersonalizer/tdestylepage.h b/kpersonalizer/tdestylepage.h
index 30b907094..af529d8f8 100644
--- a/kpersonalizer/tdestylepage.h
+++ b/kpersonalizer/tdestylepage.h
@@ -27,7 +27,7 @@
class TQListViewItem;
class TDEStylePage : public TDEStylePageDlg {
- Q_OBJECT
+ TQ_OBJECT
public:
TDEStylePage(TQWidget *parent=0, const char *name=0);
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 22:12:40 +0000