diff options
Diffstat (limited to 'krfb/krfb')
-rw-r--r-- | krfb/krfb/configuration.cc | 34 | ||||
-rw-r--r-- | krfb/krfb/configuration.h | 6 | ||||
-rw-r--r-- | krfb/krfb/invitation.cc | 4 | ||||
-rw-r--r-- | krfb/krfb/invitation.h | 4 | ||||
-rw-r--r-- | krfb/krfb/rfbcontroller.cc | 2 |
5 files changed, 25 insertions, 25 deletions
diff --git a/krfb/krfb/configuration.cc b/krfb/krfb/configuration.cc index a5c78c42..40812960 100644 --- a/krfb/krfb/configuration.cc +++ b/krfb/krfb/configuration.cc @@ -52,12 +52,12 @@ Configuration::Configuration(krfb_mode mode) : kinetdRef("kded", "kinetd") { kinetdRef.setDCOPClient(TDEApplication::dcopClient()); - loadFromKConfig(); + loadFromTDEConfig(); saveToDialogs(); doKinetdConf(); connectDCOPSignal( 0, "KRFB::ConfigChanged", "KRFB_ConfigChanged()", - "updateKConfig()", false ); + "updateTDEConfig()", false ); connect(invMngDlg.newPersonalInvitationButton, TQT_SIGNAL(clicked()), TQT_SLOT(showPersonalInvitationDialog())); connect(invMngDlg.newEmailInvitationButton, TQT_SIGNAL(clicked()), TQT_SLOT(inviteEmail())); @@ -88,9 +88,9 @@ Configuration::~Configuration() { save(); } -void Configuration::updateKConfig() +void Configuration::updateTDEConfig() { - loadFromKConfig(); + loadFromTDEConfig(); } void Configuration::setKInetdEnabled(bool enabled) { @@ -159,9 +159,9 @@ void Configuration::doKinetdConf() { } } -void Configuration::loadFromKConfig() { +void Configuration::loadFromTDEConfig() { - KConfig c("krfbrc"); + TDEConfig c("krfbrc"); allowUninvitedFlag = c.readBoolEntry("allowUninvited", false); enableSLPFlag = c.readBoolEntry("enableSLP", true); askOnConnectFlag = c.readBoolEntry("confirmUninvitedConnection", true); @@ -187,9 +187,9 @@ void Configuration::loadFromKConfig() { } -void Configuration::saveToKConfig() { +void Configuration::saveToTDEConfig() { - KConfig c("krfbrc"); + TDEConfig c("krfbrc"); c.writeEntry("confirmUninvitedConnection", askOnConnectFlag); c.writeEntry("allowDesktopControl", allowDesktopControlFlag); c.writeEntry("allowUninvited", allowUninvitedFlag); @@ -225,13 +225,13 @@ void Configuration::saveToDialogs() { } void Configuration::save() { - saveToKConfig(); + saveToTDEConfig(); saveToDialogs(); doKinetdConf(); } void Configuration::update() { - loadFromKConfig(); + loadFromTDEConfig(); saveToDialogs(); } @@ -253,7 +253,7 @@ void Configuration::invalidateOldInvitations() { void Configuration::refreshTimeout() { unsigned int invNum = invitationList.size(); - loadFromKConfig(); + loadFromTDEConfig(); saveToDialogs(); if (invNum != invitationList.size()) emit invitationNumChanged(invitationList.size()); @@ -363,7 +363,7 @@ void Configuration::setDisableXShm(bool disable) { ////////////// invitation manage dialog ////////////////////////// void Configuration::showManageInvitationsDialog() { - loadFromKConfig(); + loadFromTDEConfig(); saveToDialogs(); invMngDlg.exec(); } @@ -378,14 +378,14 @@ void Configuration::invMngDlgDeleteOnePressed() { else it++; } - saveToKConfig(); + saveToTDEConfig(); doKinetdConf(); emit invitationNumChanged(invitationList.size()); } void Configuration::invMngDlgDeleteAllPressed() { invitationList.clear(); - saveToKConfig(); + saveToTDEConfig(); doKinetdConf(); emit invitationNumChanged(invitationList.size()); } @@ -395,13 +395,13 @@ void Configuration::invMngDlgDeleteAllPressed() { void Configuration::showInvitationDialog() { invDlg.exec(); emit invitationFinished(); - saveToKConfig(); + saveToTDEConfig(); } ////////////// personal invitation dialog ////////////////////////// void Configuration::showPersonalInvitationDialog() { - loadFromKConfig(); + loadFromTDEConfig(); Invitation inv = createInvitation(); save(); emit invitationNumChanged(invitationList.size()); @@ -433,7 +433,7 @@ void Configuration::inviteEmail() { if (r == KMessageBox::Cancel) return; - loadFromKConfig(); + loadFromTDEConfig(); Invitation inv = createInvitation(); save(); emit invitationNumChanged(invitationList.size()); diff --git a/krfb/krfb/configuration.h b/krfb/krfb/configuration.h index 1f9c8ab5..f405ea11 100644 --- a/krfb/krfb/configuration.h +++ b/krfb/krfb/configuration.h @@ -91,9 +91,9 @@ public slots: void inviteEmail(); private: - void loadFromKConfig(); + void loadFromTDEConfig(); void loadFromDialogs(); - void saveToKConfig(); + void saveToTDEConfig(); void saveToDialogs(); Invitation createInvitation(); void closeInvDlg(); @@ -129,7 +129,7 @@ private: k_dcop: // Connected to the DCOP signal - void updateKConfig(); + void updateTDEConfig(); private slots: void refreshTimeout(); diff --git a/krfb/krfb/invitation.cc b/krfb/krfb/invitation.cc index a41f9808..480ab771 100644 --- a/krfb/krfb/invitation.cc +++ b/krfb/krfb/invitation.cc @@ -70,7 +70,7 @@ Invitation::Invitation(const Invitation &x) : m_viewItem(0) { } -Invitation::Invitation(KConfig* config, int num) { +Invitation::Invitation(TDEConfig* config, int num) { m_password = cryptStr(config->readEntry(TQString("password%1").arg(num), "")); m_creationTime = config->readDateTimeEntry(TQString("creation%1").arg(num)); m_expirationTime = config->readDateTimeEntry(TQString("expiration%1").arg(num)); @@ -92,7 +92,7 @@ Invitation &Invitation::operator= (const Invitation&x) { return *this; } -void Invitation::save(KConfig *config, int num) const { +void Invitation::save(TDEConfig *config, int num) const { config->writeEntry(TQString("password%1").arg(num), cryptStr(m_password)); config->writeEntry(TQString("creation%1").arg(num), m_creationTime); config->writeEntry(TQString("expiration%1").arg(num), m_expirationTime); diff --git a/krfb/krfb/invitation.h b/krfb/krfb/invitation.h index fe928d7f..2f7dbcd5 100644 --- a/krfb/krfb/invitation.h +++ b/krfb/krfb/invitation.h @@ -34,7 +34,7 @@ class Invitation { public: Invitation(); ~Invitation(); - Invitation(KConfig* config, int num); + Invitation(TDEConfig* config, int num); Invitation(const Invitation &x); Invitation &operator= (const Invitation&x); @@ -45,7 +45,7 @@ public: void setViewItem(KListViewItem*); KListViewItem* getViewItem() const; - void save(KConfig *config, int num) const; + void save(TDEConfig *config, int num) const; private: TQString m_password; TQDateTime m_creationTime; diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cc index be384118..3e6afcbc 100644 --- a/krfb/krfb/rfbcontroller.cc +++ b/krfb/krfb/rfbcontroller.cc @@ -720,7 +720,7 @@ enum rfbNewClientAction RFBController::handleNewClient(rfbClientPtr cl) cl->negotiationFinishedHook = negotiationFinishedHook; TQString host, port; - KSocketAddress *ksa = KExtendedSocket::peerAddress(socket); + TDESocketAddress *ksa = KExtendedSocket::peerAddress(socket); if (ksa) { hostent *he = 0; KInetSocketAddress *kisa = (KInetSocketAddress*) ksa; |