summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ConfigureChecks.cmake18
-rw-r--r--kbiff/kbiffmonitor.cpp6
-rw-r--r--kbiff/setupdlg.cpp24
3 files changed, 28 insertions, 20 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index c43a8be..02b3fea 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -9,7 +9,7 @@
# required stuff
-tde_setup_architecture_flags( )
+tde_setup_compiler_flags( )
include(TestBigEndian)
test_big_endian(WORDS_BIGENDIAN)
@@ -45,9 +45,17 @@ endif( WITH_SSL )
#### check for ASUS Mail LED
if( WITH_MLED )
- if( EXISTS "/proc/acpi/asus/mled" )
- set( HAVE_MLED 1 )
- else( )
- tde_mesage_fatal( "ASUS Mail LED support was requested but not found in ACPI" )
+ set( HAVE_MLED 1 )
+ if( NOT EXISTS "/proc/acpi/asus/mled" )
+ message( WARNING
+ "\n"
+ "-DWITH_MLED=ON requires 'asus-laptop' kernel module from acpi4asus "
+ "project to work, which was not found on your system. The project is "
+ "currently abandoned and the module doesn't support linux kernels above "
+ "2.6.19. There is no harm in enabling the flag besides an additional "
+ "message on stderr, but you won't get any benefits from it either unless "
+ "you run some very unusual system configuration."
+ "\n"
+ )
endif( )
endif( WITH_MLED )
diff --git a/kbiff/kbiffmonitor.cpp b/kbiff/kbiffmonitor.cpp
index fb9ed8d..398f407 100644
--- a/kbiff/kbiffmonitor.cpp
+++ b/kbiff/kbiffmonitor.cpp
@@ -40,7 +40,7 @@
#include <tqregexp.h>
#include <tqdir.h>
#include <tqdatetime.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
// Needed for CRAM-MD5 and APOP
#include <kmdcodec.h>
@@ -111,7 +111,7 @@ KBiffMonitor::~KBiffMonitor()
void KBiffMonitor::readConfig()
{
- KSimpleConfig *config = new KSimpleConfig(MAIL_STATE_FILE);
+ TDESimpleConfig *config = new TDESimpleConfig(MAIL_STATE_FILE);
config->setDollarExpansion(false);
TQString group;
@@ -152,7 +152,7 @@ void KBiffMonitor::readConfig()
void KBiffMonitor::saveConfig()
{
// open the config file
- KSimpleConfig *config = new KSimpleConfig(MAIL_STATE_FILE);
+ TDESimpleConfig *config = new TDESimpleConfig(MAIL_STATE_FILE);
config->setDollarExpansion(false);
TQString group;
diff --git a/kbiff/setupdlg.cpp b/kbiff/setupdlg.cpp
index 2eae388..98919c5 100644
--- a/kbiff/setupdlg.cpp
+++ b/kbiff/setupdlg.cpp
@@ -36,7 +36,7 @@
#include <kiconloader.h>
#include <tdelocale.h>
#include <tdestandarddirs.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <kbiffurl.h>
#include <tdeprocess.h>
#include <krun.h>
@@ -311,7 +311,7 @@ void KBiffSetup::readConfig(const TQString& profile_)
TQStringList profile_list;
// open the config file
- KSimpleConfig *config = new KSimpleConfig(CONFIG_FILE, true);
+ TDESimpleConfig *config = new TDESimpleConfig(CONFIG_FILE, true);
config->setDollarExpansion(false);
config->setGroup("General");
@@ -348,7 +348,7 @@ TQString KBiffSetup::getSomeProfile() const
TQStringList profile_list;
// open the config file
- KSimpleConfig *config = new KSimpleConfig(CONFIG_FILE, true);
+ TDESimpleConfig *config = new TDESimpleConfig(CONFIG_FILE, true);
config->setGroup("General");
// read in the mailboxes
@@ -366,7 +366,7 @@ TQString KBiffSetup::getSomeProfile() const
void KBiffSetup::saveConfig()
{
// open the config file for writing
- KSimpleConfig *config = new KSimpleConfig(CONFIG_FILE);
+ TDESimpleConfig *config = new TDESimpleConfig(CONFIG_FILE);
config->setGroup("General");
@@ -452,7 +452,7 @@ void KBiffSetup::slotRenameProfile()
comboProfile->insertItem(profile_name, 0);
// remove the reference from the config file
- KSimpleConfig *config = new KSimpleConfig(CONFIG_FILE);
+ TDESimpleConfig *config = new TDESimpleConfig(CONFIG_FILE);
// nuke the group
config->deleteGroup(old_profile, true);
delete config;
@@ -483,7 +483,7 @@ void KBiffSetup::slotDeleteProfile()
saveConfig();
// remove the reference from the config file
- KSimpleConfig *config = new KSimpleConfig(CONFIG_FILE);
+ TDESimpleConfig *config = new TDESimpleConfig(CONFIG_FILE);
// nuke the group
config->deleteGroup(profile, true);
delete config;
@@ -715,7 +715,7 @@ int KBiffGeneralTab::getPoll() const
void KBiffGeneralTab::readConfig(const TQString& profile_)
{
// open the config file
- KSimpleConfig *config = new KSimpleConfig(CONFIG_FILE, true);
+ TDESimpleConfig *config = new TDESimpleConfig(CONFIG_FILE, true);
config->setGroup(profile_);
@@ -779,7 +779,7 @@ static TQString justIconName(const TQString& icon_name)
void KBiffGeneralTab::saveConfig(const TQString& profile_)
{
// open the config file for writing
- KSimpleConfig *config = new KSimpleConfig(CONFIG_FILE);
+ TDESimpleConfig *config = new TDESimpleConfig(CONFIG_FILE);
config->setGroup(profile_);
@@ -878,7 +878,7 @@ void KBiffNewMailTab::testPlaySound()
void KBiffNewMailTab::readConfig(const TQString& profile_)
{
// open the config file
- KSimpleConfig *config = new KSimpleConfig(CONFIG_FILE, true);
+ TDESimpleConfig *config = new TDESimpleConfig(CONFIG_FILE, true);
config->setGroup(profile_);
@@ -901,7 +901,7 @@ void KBiffNewMailTab::readConfig(const TQString& profile_)
void KBiffNewMailTab::saveConfig(const TQString& profile_)
{
- KSimpleConfig *config = new KSimpleConfig(CONFIG_FILE);
+ TDESimpleConfig *config = new TDESimpleConfig(CONFIG_FILE);
config->setGroup(profile_);
@@ -1402,7 +1402,7 @@ void KBiffMailboxTab::readConfig(const TQString& profile_)
oldItem = 0;
// open the config file
- KSimpleConfig *config = new KSimpleConfig(CONFIG_FILE, true);
+ TDESimpleConfig *config = new TDESimpleConfig(CONFIG_FILE, true);
config->setDollarExpansion(false);
mailboxHash->clear();
@@ -1457,7 +1457,7 @@ void KBiffMailboxTab::readConfig(const TQString& profile_)
void KBiffMailboxTab::saveConfig(const TQString& profile_)
{
// open the config file
- KSimpleConfig *config = new KSimpleConfig(CONFIG_FILE);
+ TDESimpleConfig *config = new TDESimpleConfig(CONFIG_FILE);
config->setDollarExpansion(false);
config->setGroup(profile_);