summaryrefslogtreecommitdiffstats
path: root/ksirc
diff options
context:
space:
mode:
Diffstat (limited to 'ksirc')
-rw-r--r--ksirc/FilterRuleEditor.cpp14
-rw-r--r--ksirc/KSOpenkSirc/open_ksirc.cpp4
-rw-r--r--ksirc/KSPrefs/page_autoconnect.cpp4
-rw-r--r--ksirc/KSPrefs/page_colors.cpp4
-rw-r--r--ksirc/KSPrefs/page_rmbmenu.cpp4
-rw-r--r--ksirc/KSPrefs/page_servchan.cpp4
-rw-r--r--ksirc/KSTicker/ksticker.cpp6
-rw-r--r--ksirc/KSTicker/ksttest.cpp2
-rw-r--r--ksirc/NewWindowDialog.cpp8
-rw-r--r--ksirc/dccNew.cpp4
-rw-r--r--ksirc/ksircprocess.cpp4
-rw-r--r--ksirc/ksopts.cpp4
-rw-r--r--ksirc/ksview.cpp2
-rw-r--r--ksirc/mditoplevel.cpp4
-rw-r--r--ksirc/servercontroller.cpp24
-rw-r--r--ksirc/servercontroller.h4
-rw-r--r--ksirc/toplevel.cpp10
-rw-r--r--ksirc/usercontrolmenu.cpp8
-rw-r--r--ksirc/usercontrolmenu.h4
19 files changed, 59 insertions, 59 deletions
diff --git a/ksirc/FilterRuleEditor.cpp b/ksirc/FilterRuleEditor.cpp
index 76fd1190..46819832 100644
--- a/ksirc/FilterRuleEditor.cpp
+++ b/ksirc/FilterRuleEditor.cpp
@@ -77,7 +77,7 @@ void FilterRuleEditor::newRule()
void FilterRuleEditor::OkPressed()
{
int number, after;
- KConfig *kConfig = kapp->config();
+ TDEConfig *kConfig = kapp->config();
if(filter->InsertButton->isEnabled()){
number = kConfig->readNumEntry("Rules", 0) + 1;
@@ -120,7 +120,7 @@ void FilterRuleEditor::OkPressed()
void FilterRuleEditor::updateListBox(int citem )
{
- KConfig *kConfig = kapp->config();
+ TDEConfig *kConfig = kapp->config();
kConfig->setGroup("FilterRules");
int number = kConfig->readNumEntry("Rules", 0);
filter->RuleList->clear();
@@ -142,7 +142,7 @@ void FilterRuleEditor::updateListBox(int citem )
void FilterRuleEditor::moveRule(int from, int to)
{
- KConfig *kConfig = kapp->config();
+ TDEConfig *kConfig = kapp->config();
kConfig->setGroup("FilterRules");
TQString src;
TQString dest;
@@ -169,7 +169,7 @@ void FilterRuleEditor::deleteRule()
int number = filter->RuleList->currentItem();
if( number >= 0){
- KConfig *kConfig = kapp->config();
+ TDEConfig *kConfig = kapp->config();
kConfig->setGroup("FilterRules");
int max = kConfig->readNumEntry("Rules");
for(int i = number+2; i <= max; i++){
@@ -185,7 +185,7 @@ void FilterRuleEditor::deleteRule()
void FilterRuleEditor::newHighlight(int i)
{
i++;
- KConfig *kConfig = kapp->config();
+ TDEConfig *kConfig = kapp->config();
kConfig->setGroup("FilterRules");
TQString key;
key.sprintf("name-%d", i);
@@ -201,7 +201,7 @@ void FilterRuleEditor::newHighlight(int i)
void FilterRuleEditor::raiseRule()
{
int item = filter->RuleList->currentItem();
- KConfig *kConfig = kapp->config();
+ TDEConfig *kConfig = kapp->config();
kConfig->setGroup("FilterRules");
int max = kConfig->readNumEntry("Rules");
if(item > 0){
@@ -215,7 +215,7 @@ void FilterRuleEditor::raiseRule()
void FilterRuleEditor::lowerRule()
{
int item = filter->RuleList->currentItem();
- KConfig *kConfig = kapp->config();
+ TDEConfig *kConfig = kapp->config();
kConfig->setGroup("FilterRules");
int max = kConfig->readNumEntry("Rules");
if(item < max-1){
diff --git a/ksirc/KSOpenkSirc/open_ksirc.cpp b/ksirc/KSOpenkSirc/open_ksirc.cpp
index 9b794639..41e13323 100644
--- a/ksirc/KSOpenkSirc/open_ksirc.cpp
+++ b/ksirc/KSOpenkSirc/open_ksirc.cpp
@@ -63,7 +63,7 @@ open_ksirc::open_ksirc
}
// Add current ones
- KConfig *conf = kapp->config();
+ TDEConfig *conf = kapp->config();
conf->setGroup("ServerList");
CheckB_StorePassword->setChecked( conf->readBoolEntry("StorePasswords") );
TQStringList recent = conf->readListEntry("RecentServers");
@@ -276,7 +276,7 @@ void open_ksirc::clickConnect()
TQString port;
TQString script;
Server *serv;
- KConfig *conf = kapp->config();
+ TDEConfig *conf = kapp->config();
hide();
diff --git a/ksirc/KSPrefs/page_autoconnect.cpp b/ksirc/KSPrefs/page_autoconnect.cpp
index 1b311682..2c868841 100644
--- a/ksirc/KSPrefs/page_autoconnect.cpp
+++ b/ksirc/KSPrefs/page_autoconnect.cpp
@@ -43,7 +43,7 @@ PageAutoConnect::~PageAutoConnect()
void PageAutoConnect::saveConfig()
{
- KConfig *conf = kapp->config();
+ TDEConfig *conf = kapp->config();
conf->setGroup("AutoConnect");
TQStringList servers;
@@ -92,7 +92,7 @@ void PageAutoConnect::saveConfig()
void PageAutoConnect::readConfig()
{
- KConfig *conf = kapp->config();
+ TDEConfig *conf = kapp->config();
conf->setGroup("AutoConnect");
TQStringList servers = conf->readListEntry("Servers");
servers.sort();
diff --git a/ksirc/KSPrefs/page_colors.cpp b/ksirc/KSPrefs/page_colors.cpp
index c6a3eb9e..ae5c25fa 100644
--- a/ksirc/KSPrefs/page_colors.cpp
+++ b/ksirc/KSPrefs/page_colors.cpp
@@ -87,7 +87,7 @@ void PageColors::saveConfig()
ksopts->mircColors = allowMIRCColorsCB->isChecked();
ksopts->colourTheme = themeLB->currentText();
- KConfig *conf = kapp->config();
+ TDEConfig *conf = kapp->config();
TQDictIterator<KSOColors> it(m_dcol);
TQStringList names;
for(; it.current(); ++it){
@@ -158,7 +158,7 @@ void PageColors::readConfig( const KSOColors *opts )
allowKSircColorsCB->setChecked( opts->ksircColors );
allowMIRCColorsCB->setChecked( opts->mircColors );
- KConfig *conf = kapp->config();
+ TDEConfig *conf = kapp->config();
conf->setGroup("ColourSchemes");
themeLB->clear();
TQStringList names = conf->readListEntry("Names");
diff --git a/ksirc/KSPrefs/page_rmbmenu.cpp b/ksirc/KSPrefs/page_rmbmenu.cpp
index de30a829..0a5c223f 100644
--- a/ksirc/KSPrefs/page_rmbmenu.cpp
+++ b/ksirc/KSPrefs/page_rmbmenu.cpp
@@ -24,7 +24,7 @@ PageRMBMenu::PageRMBMenu( TQWidget *parent, const char *name ) : PageRMBMenuBase
{
UserControlMenu *ucm;
- UserControlMenu::parseKConfig();
+ UserControlMenu::parseTDEConfig();
commandLB->clear();
for(ucm = UserControlMenu::UserMenu.first();
@@ -65,7 +65,7 @@ PageRMBMenu::~PageRMBMenu()
void PageRMBMenu::saveConfig()
{
- UserControlMenu::writeKConfig();
+ UserControlMenu::writeTDEConfig();
}
void PageRMBMenu::readConfig( const KSORMBMenu * )
diff --git a/ksirc/KSPrefs/page_servchan.cpp b/ksirc/KSPrefs/page_servchan.cpp
index b3a87284..24e36938 100644
--- a/ksirc/KSPrefs/page_servchan.cpp
+++ b/ksirc/KSPrefs/page_servchan.cpp
@@ -37,7 +37,7 @@ void PageServChan::saveConfig()
if(!txt.isNull())
sLB << txt;
}
- KConfig *conf = kapp->config();
+ TDEConfig *conf = kapp->config();
conf->setGroup("ServerList");
conf->writeEntry("RecentServers", sLB);
@@ -53,7 +53,7 @@ void PageServChan::saveConfig()
void PageServChan::readConfig( const KSOServChan * )
{
- KConfig *conf = kapp->config();
+ TDEConfig *conf = kapp->config();
conf->setGroup("ServerList");
TQStringList recent = conf->readListEntry("RecentServers");
recent.sort();
diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp
index 84821e7d..5187489a 100644
--- a/ksirc/KSTicker/ksticker.cpp
+++ b/ksirc/KSTicker/ksticker.cpp
@@ -30,7 +30,7 @@ KSTicker::KSTicker(TQWidget * parent, const char * name, WFlags f)
pic = new TQPixmap(); // create pic map here, resize it later though.
// pic->setBackgroundMode(TransparentMode);
- KConfig *conf = kapp->config();
+ TDEConfig *conf = kapp->config();
conf->setGroup("KSTicker");
bScrollConstantly = conf->readNumEntry("ScollConst", FALSE);
@@ -445,7 +445,7 @@ void KSTicker::scrollConstantly()
popup->setItemChecked(iScrollItem, bScrollConstantly);
if(bScrollConstantly == TRUE)
startTicker();
- KConfig *conf = kapp->config();
+ TDEConfig *conf = kapp->config();
conf->setGroup("KSTicker");
conf->writeEntry("ScollConst", bScrollConstantly);
conf->sync();
@@ -456,7 +456,7 @@ void KSTicker::updateFont(const TQFont &font){
setFixedHeight((fontMetrics().height()+fontMetrics().descent()*2)*pHeight);
resize(fontMetrics().width("X")*chars,
(fontMetrics().height()+fontMetrics().descent())*pHeight);
- KConfig *conf = kapp->config();
+ TDEConfig *conf = kapp->config();
conf->setGroup("KSTicker");
conf->writeEntry("Font", font);
conf->sync();
diff --git a/ksirc/KSTicker/ksttest.cpp b/ksirc/KSTicker/ksttest.cpp
index 880626b4..ad8c3864 100644
--- a/ksirc/KSTicker/ksttest.cpp
+++ b/ksirc/KSTicker/ksttest.cpp
@@ -13,7 +13,7 @@
#include "ksttest.h"
#include "../ksopts.h"
-KConfig *kConfig;
+TDEConfig *kConfig;
StdInTicker::StdInTicker()
: KSTicker()
diff --git a/ksirc/NewWindowDialog.cpp b/ksirc/NewWindowDialog.cpp
index 1a0f2dba..ce8309cc 100644
--- a/ksirc/NewWindowDialog.cpp
+++ b/ksirc/NewWindowDialog.cpp
@@ -35,16 +35,16 @@ NewWindowDialog::NewWindowDialog(const KSircChannel &channelInfo, TQWidget * par
connect( m_combo->lineEdit(), TQT_SIGNAL(textChanged ( const TQString & )),
this, TQT_SLOT( slotTextChanged( const TQString &)));
- KConfig *kConfig = kapp->config();
- KConfigGroupSaver saver(kConfig, "Recent");
+ TDEConfig *kConfig = kapp->config();
+ TDEConfigGroupSaver saver(kConfig, "Recent");
m_combo->setHistoryItems(kConfig->readListEntry("Channels"));
slotTextChanged( m_combo->lineEdit()->text());
}
NewWindowDialog::~NewWindowDialog()
{
- KConfig *kConfig = kapp->config();
- KConfigGroupSaver saver(kConfig, "Recent");
+ TDEConfig *kConfig = kapp->config();
+ TDEConfigGroupSaver saver(kConfig, "Recent");
kConfig->writeEntry("Channels", m_combo->historyItems());
}
diff --git a/ksirc/dccNew.cpp b/ksirc/dccNew.cpp
index fef6b27b..5d345cc2 100644
--- a/ksirc/dccNew.cpp
+++ b/ksirc/dccNew.cpp
@@ -69,7 +69,7 @@ dccNew::dccNew( TQWidget *parent, const char *name, int type, TQString nick )
}
cbNicks->setCurrentText(nick);
- KConfig *kConfig = kapp->config();
+ TDEConfig *kConfig = kapp->config();
kConfig->setGroup("dccNew");
bool chatChecked = kConfig->readBoolEntry("chatChecked", false);
@@ -123,7 +123,7 @@ void dccNew::fileSendClicked()
void dccNew::sendClicked()
{
- KConfig *kConfig = kapp->config();
+ TDEConfig *kConfig = kapp->config();
kConfig->setGroup("dccNew");
kConfig->writeEntry("chatChecked",rbChat->isChecked());
int type = Chat;
diff --git a/ksirc/ksircprocess.cpp b/ksirc/ksircprocess.cpp
index 6d46bdba..47e36c52 100644
--- a/ksirc/ksircprocess.cpp
+++ b/ksirc/ksircprocess.cpp
@@ -141,7 +141,7 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa
// Setup the environment for KSirc
TQString qsNick, qsRealname, qsUserID, qsAltNick;
- KConfig *kConfig = kapp->config();
+ TDEConfig *kConfig = kapp->config();
kConfig->setGroup("StartUp");
qsNick = ksopts->serv(kss).nick;
qsAltNick = ksopts->serv(kss).altNick;
@@ -583,7 +583,7 @@ void KSircProcess::filters_update()
cur = it.current();
}
}
- KConfig *kConfig = kapp->config();
+ TDEConfig *kConfig = kapp->config();
kConfig->setGroup("FilterRules");
int max = kConfig->readNumEntry("Rules", 0);
for(int number = 1; number <= max; number++){
diff --git a/ksirc/ksopts.cpp b/ksirc/ksopts.cpp
index de03ab79..4b3517a4 100644
--- a/ksirc/ksopts.cpp
+++ b/ksirc/ksopts.cpp
@@ -140,7 +140,7 @@ KSOChannel::KSOChannel()
void KSOptions::load( int sections )
{
- KConfig *conf = kapp->config();
+ TDEConfig *conf = kapp->config();
conf->setGroup( "ServerController" );
geometry = conf->readRectEntry( "Size" );
@@ -355,7 +355,7 @@ void KSOptions::load( int sections )
void KSOptions::save( int sections )
{
- KConfig *conf = kapp->config();
+ TDEConfig *conf = kapp->config();
if ( sections & General )
{
diff --git a/ksirc/ksview.cpp b/ksirc/ksview.cpp
index 597b2393..81177b13 100644
--- a/ksirc/ksview.cpp
+++ b/ksirc/ksview.cpp
@@ -96,7 +96,7 @@ void KSircView::saveURL( const TQString &url )
if ( dlg->exec() ) {
KURL destURL( dlg->selectedURL() );
if ( destURL.isValid() ) {
- KIO::Job *job = KIO::copy( kurl, destURL );
+ TDEIO::Job *job = TDEIO::copy( kurl, destURL );
job->setAutoErrorHandlingEnabled( true );
}
}
diff --git a/ksirc/mditoplevel.cpp b/ksirc/mditoplevel.cpp
index 5dac79ad..510b40e8 100644
--- a/ksirc/mditoplevel.cpp
+++ b/ksirc/mditoplevel.cpp
@@ -45,7 +45,7 @@ MDITopLevel::MDITopLevel(TQWidget *parent, const char *name)
connect( m_tab, TQT_SIGNAL( showContexMenu(TQWidget *, const TQPoint &) ),
this, TQT_SLOT( slotShowContexMenu(TQWidget *, const TQPoint &) ) );
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
config->setGroup("MDI");
TQSize s( 600, 360 );
resize(config->readSizeEntry( "TopLevelSize", &s ));
@@ -62,7 +62,7 @@ MDITopLevel::~MDITopLevel()
{
kdDebug(5008) << "~MDITopLevel in" << endl;
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
config->setGroup( "MDI" );
config->writeEntry( "TopLevelSize", this->size() );
config->sync();
diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp
index 9f979369..61495815 100644
--- a/ksirc/servercontroller.cpp
+++ b/ksirc/servercontroller.cpp
@@ -383,7 +383,7 @@ void servercontroller::font_update(const TQFont &font)
ksopts->defaultFont = font;
/* configChange(); */
- KConfig *kConfig = kapp->config();
+ TDEConfig *kConfig = kapp->config();
kConfig->setGroup("GlobalOptions");
kConfig->sync();
TQApplication::setFont( font, true, "KSirc::TextView" );
@@ -581,7 +581,7 @@ void servercontroller::slot_filters_update()
emit ServMessage(TQString(), ServCommand::updateFilters, TQString());
}
-void servercontroller::saveGlobalProperties(KConfig *ksc)
+void servercontroller::saveGlobalProperties(TDEConfig *ksc)
{
// ksc hos the K Session config
// ksp == current KSircProcess
@@ -608,9 +608,9 @@ void servercontroller::saveGlobalProperties(KConfig *ksc)
desktops << TQString::number( ( *sessionInfoIt ).desktop );
}
- KConfigGroup( ksc, "KSircSession" ).writeEntry( it.key(), channels );
- KConfigGroup( ksc, "KSircSessionPort" ).writeEntry( it.key(), port );
- KConfigGroup( ksc, "KSircSessionDesktopNumbers" ).writeEntry( it.key(), desktops );
+ TDEConfigGroup( ksc, "KSircSession" ).writeEntry( it.key(), channels );
+ TDEConfigGroup( ksc, "KSircSessionPort" ).writeEntry( it.key(), port );
+ TDEConfigGroup( ksc, "KSircSessionDesktopNumbers" ).writeEntry( it.key(), desktops );
}
ksc->setGroup("ServerController");
@@ -619,7 +619,7 @@ void servercontroller::saveGlobalProperties(KConfig *ksc)
ksc->setGroup(group);
}
-void servercontroller::readGlobalProperties(KConfig *ksc)
+void servercontroller::readGlobalProperties(TDEConfig *ksc)
{
TQString group = ksc->group();
@@ -636,13 +636,13 @@ void servercontroller::readGlobalProperties(KConfig *ksc)
while(it != keyMap.end()) {
TQString server = it.key();
- TQString port = KConfigGroup( ksc, "KSircSessionPort" ).readEntry( server );
+ TQString port = TDEConfigGroup( ksc, "KSircSessionPort" ).readEntry( server );
// debug("%s", it.key().latin1());
KSircServer kss(server, port);
new_ksircprocess( kss ); // sets up proc_list
TQStringList channels = ksc->readListEntry( server );
- TQStringList desktops = KConfigGroup( ksc, "KSircSessionDesktopNumbers" ).readListEntry( server );
+ TQStringList desktops = TDEConfigGroup( ksc, "KSircSessionDesktopNumbers" ).readListEntry( server );
for(uint i = 0; i < channels.count(); i++){
@@ -739,8 +739,8 @@ void servercontroller::saveDockingStatus()
if ( we_are_exiting ) // we are hidden by closeEvent
return;
-// KConfig *kConfig = kapp->config();
-// KConfigGroupSaver s( kConfig, "ServerController" );
+// TDEConfig *kConfig = kapp->config();
+// TDEConfigGroupSaver s( kConfig, "ServerController" );
// kConfig->writeEntry("Docked", !isVisible());
// kConfig->sync();
}
@@ -838,7 +838,7 @@ void servercontroller::do_autoconnect()
kdDebug(5008) << "Doing AUTOCONNECT" << endl;
- KConfig *conf = kapp->config();
+ TDEConfig *conf = kapp->config();
conf->setGroup("AutoConnect");
TQStringList servers = conf->readListEntry("Servers");
servers.sort();
@@ -923,7 +923,7 @@ void servercontroller::start_autoconnect() {
void servercontroller::start_autoconnect_check() {
- KConfig *conf = kapp->config();
+ TDEConfig *conf = kapp->config();
conf->setGroup("AutoConnect");
TQStringList servers = conf->readListEntry("Servers");
diff --git a/ksirc/servercontroller.h b/ksirc/servercontroller.h
index f6d8024d..7115f23a 100644
--- a/ksirc/servercontroller.h
+++ b/ksirc/servercontroller.h
@@ -208,8 +208,8 @@ protected:
virtual void closeEvent( TQCloseEvent * );
void saveDockingStatus();
- void saveGlobalProperties(KConfig *);
- void readGlobalProperties(KConfig *);
+ void saveGlobalProperties(TDEConfig *);
+ void readGlobalProperties(TDEConfig *);
private:
void saveSessionConfig();
diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp
index 264eecf3..de75ee5f 100644
--- a/ksirc/toplevel.cpp
+++ b/ksirc/toplevel.cpp
@@ -289,7 +289,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
clearWindow();
if(isPrivateChat()){
- KConfig conf("ksirc/winlog/" + channelInfo.server() + "-" + channelInfo.channel(),
+ TDEConfig conf("ksirc/winlog/" + channelInfo.server() + "-" + channelInfo.channel(),
false, false, "data");
TQString group = "Message-History";
@@ -419,7 +419,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
*/
if(user_menu == 0)
- user_menu = UserControlMenu::parseKConfig();
+ user_menu = UserControlMenu::parseTDEConfig();
user_controls = new TQPopupMenu(this);
kmenu->insertItem(i18n("&Users"), user_controls);
@@ -562,7 +562,7 @@ KSircTopLevel::~KSircTopLevel()
}
- KConfig conf("ksirc/winlog/" + channelInfo().server() +
+ TDEConfig conf("ksirc/winlog/" + channelInfo().server() +
"-" + channelInfo().channel(),
false, false, "data");
TQString group = "Message-History";
@@ -1672,9 +1672,9 @@ void KSircTopLevel::saveCurrLog()
temp.close();
#if KDE_IS_VERSION(3,1,92)
- KIO::NetAccess::upload(temp.name(), url, this);
+ TDEIO::NetAccess::upload(temp.name(), url, this);
#else
- KIO::NetAccess::upload(temp.name(), url);
+ TDEIO::NetAccess::upload(temp.name(), url);
#endif
}
diff --git a/ksirc/usercontrolmenu.cpp b/ksirc/usercontrolmenu.cpp
index 704b5511..6fddff90 100644
--- a/ksirc/usercontrolmenu.cpp
+++ b/ksirc/usercontrolmenu.cpp
@@ -23,14 +23,14 @@ UserControlMenu::~UserControlMenu()
{
}
-TQPtrList<UserControlMenu> *UserControlMenu::parseKConfig()
+TQPtrList<UserControlMenu> *UserControlMenu::parseTDEConfig()
{
// Reset the UserMenu to nothing before we start.
UserMenu.clear();
- KConfig *kConfig = kapp->config();
+ TDEConfig *kConfig = kapp->config();
kConfig->setGroup("UserMenu");
int items = kConfig->readNumEntry("Number");
if(items == 0){
@@ -129,9 +129,9 @@ TQPtrList<UserControlMenu> *UserControlMenu::parseKConfig()
}
-void UserControlMenu::writeKConfig()
+void UserControlMenu::writeTDEConfig()
{
- KConfig *kConfig = kapp->config();
+ TDEConfig *kConfig = kapp->config();
kConfig->setGroup("UserMenu");
int items = (int) UserMenu.count();
diff --git a/ksirc/usercontrolmenu.h b/ksirc/usercontrolmenu.h
index 02a313f9..5ffdfbb4 100644
--- a/ksirc/usercontrolmenu.h
+++ b/ksirc/usercontrolmenu.h
@@ -21,8 +21,8 @@ class UserControlMenu {
static TQPtrList<UserControlMenu> UserMenu;
- static TQPtrList<UserControlMenu> *parseKConfig();
- static void writeKConfig();
+ static TQPtrList<UserControlMenu> *parseTDEConfig();
+ static void writeTDEConfig();
/**
* title in the popup menu