Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 7dba2f0cd3
commit 6d23eb84da

@ -353,7 +353,7 @@ int MainWindow::getParenthesesLevel(const TQString &str)
void MainWindow::loadConfig() void MainWindow::loadConfig()
{ {
{ {
KConfigGroup config(TDEGlobal::config(), "Settings"); TDEConfigGroup config(TDEGlobal::config(), "Settings");
TQString mode = config.readEntry("Trigonometric mode", "Degrees"); TQString mode = config.readEntry("Trigonometric mode", "Degrees");
if(mode == "Degrees") { if(mode == "Degrees") {
@ -377,7 +377,7 @@ void MainWindow::loadConfig()
} }
{ {
KConfigGroup config(TDEGlobal::config(), "Variables"); TDEConfigGroup config(TDEGlobal::config(), "Variables");
TQStringList list = config.readListEntry("Saved Variables"); TQStringList list = config.readListEntry("Saved Variables");
for(TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { for(TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) {
@ -392,7 +392,7 @@ void MainWindow::loadConfig()
} }
{ {
KConfigGroup config(TDEGlobal::config(), "GUI"); TDEConfigGroup config(TDEGlobal::config(), "GUI");
bool showHistory = config.readBoolEntry("ShowHistory", true); bool showHistory = config.readBoolEntry("ShowHistory", true);
action<KToggleAction>("toggleHistoryList")->setChecked(showHistory); action<KToggleAction>("toggleHistoryList")->setChecked(showHistory);
@ -415,7 +415,7 @@ void MainWindow::loadConfig()
} }
{ {
KConfigGroup config(TDEGlobal::config(), "Functions"); TDEConfigGroup config(TDEGlobal::config(), "Functions");
TQStringList fnList = config.readListEntry("FunctionList"); TQStringList fnList = config.readListEntry("FunctionList");
for(TQStringList::ConstIterator it = fnList.begin(); it != fnList.end(); ++it) for(TQStringList::ConstIterator it = fnList.begin(); it != fnList.end(); ++it)
@ -428,7 +428,7 @@ void MainWindow::loadConfig()
void MainWindow::saveConfig() void MainWindow::saveConfig()
{ {
{ {
KConfigGroup config(TDEGlobal::config(), "Settings"); TDEConfigGroup config(TDEGlobal::config(), "Settings");
config.writeEntry("Trigonometric mode", config.writeEntry("Trigonometric mode",
trigMode() == Abakus::Degrees trigMode() == Abakus::Degrees
@ -440,7 +440,7 @@ void MainWindow::saveConfig()
} }
{ {
KConfigGroup config(TDEGlobal::config(), "Variables"); TDEConfigGroup config(TDEGlobal::config(), "Variables");
TQStringList list; TQStringList list;
TQStringList values = ValueManager::instance()->valueNames(); TQStringList values = ValueManager::instance()->valueNames();
@ -462,7 +462,7 @@ void MainWindow::saveConfig()
} }
{ {
KConfigGroup config(TDEGlobal::config(), "GUI"); TDEConfigGroup config(TDEGlobal::config(), "GUI");
bool inCompactMode = action<KToggleAction>("toggleCompactMode")->isChecked(); bool inCompactMode = action<KToggleAction>("toggleCompactMode")->isChecked();
config.writeEntry("InCompactMode", inCompactMode); config.writeEntry("InCompactMode", inCompactMode);
@ -480,7 +480,7 @@ void MainWindow::saveConfig()
} }
{ {
KConfigGroup config(TDEGlobal::config(), "Functions"); TDEConfigGroup config(TDEGlobal::config(), "Functions");
FunctionManager *manager = FunctionManager::instance(); FunctionManager *manager = FunctionManager::instance();

Loading…
Cancel
Save