diff options
32 files changed, 164 insertions, 67 deletions
diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp index ccc7f612..aeff9d43 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp @@ -56,7 +56,7 @@ #include <tdemessagebox.h> #include <kjanuswidget.h> #include <tdelistview.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include "sambashare.h" #include "sambafile.h" @@ -1267,7 +1267,7 @@ void KcmSambaConf::save() { // Base settings _smbconf = _interface->configUrlRq->url(); - KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),false); + TDESimpleConfig config(TQString::fromLatin1(FILESHARECONF),false); config.writeEntry("SMBCONF",_smbconf); config.sync(); diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp index e48e7f98..39425834 100644 --- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp +++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp @@ -21,7 +21,7 @@ #include <tqprocess.h> #include <tqfileinfo.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kdebug.h> #include <tqfileinfo.h> #include <tdeio/job.h> @@ -652,7 +652,7 @@ bool SambaFile::saveTo(const TQString & path) } -SambaConfigFile* SambaFile::getSambaConfigFile(KSimpleConfig* config) +SambaConfigFile* SambaFile::getSambaConfigFile(TDESimpleConfig* config) { TQStringList groups = config->groupList(); @@ -677,9 +677,9 @@ SambaConfigFile* SambaFile::getSambaConfigFile(KSimpleConfig* config) } -KSimpleConfig* SambaFile::getSimpleConfig(SambaConfigFile* sambaConfig, const TQString & path) +TDESimpleConfig* SambaFile::getSimpleConfig(SambaConfigFile* sambaConfig, const TQString & path) { - KSimpleConfig *config = new KSimpleConfig(path,false); + TDESimpleConfig *config = new TDESimpleConfig(path,false); TQDictIterator<SambaShare> it(*sambaConfig); diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.h b/filesharing/advanced/kcm_sambaconf/sambafile.h index 08597d01..0e7d5525 100644 --- a/filesharing/advanced/kcm_sambaconf/sambafile.h +++ b/filesharing/advanced/kcm_sambaconf/sambafile.h @@ -29,7 +29,7 @@ #include "sambashare.h" -class KSimpleConfig; +class TDESimpleConfig; class TDEProcess; class TDEConfig; class KTempFile; @@ -149,8 +149,8 @@ protected: int _sambaVersion; void parseParmStdOutput(); - SambaConfigFile* getSambaConfigFile(KSimpleConfig* config); - KSimpleConfig* getSimpleConfig(SambaConfigFile* sambaConfig, const TQString & filename); + SambaConfigFile* getSambaConfigFile(TDESimpleConfig* config); + TDESimpleConfig* getSimpleConfig(SambaConfigFile* sambaConfig, const TQString & filename); diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp index 532b7298..6cb95a50 100644 --- a/filesharing/simple/fileshare.cpp +++ b/filesharing/simple/fileshare.cpp @@ -37,7 +37,7 @@ #include <ksambashare.h> #include <tdefileshare.h> #include <tdestandarddirs.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdemessagebox.h> #include <tdeapplication.h> #include <kuser.h> @@ -196,7 +196,7 @@ void KFileShareConfig::allowedUsersBtnClicked() { void KFileShareConfig::load() { - KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),true); + TDESimpleConfig config(TQString::fromLatin1(FILESHARECONF),true); m_ccgui->shareGrp->setChecked( config.readEntry("FILESHARING", "yes") == "yes" ); diff --git a/kget/transfer.cpp b/kget/transfer.cpp index d8a853d7..8781409c 100644 --- a/kget/transfer.cpp +++ b/kget/transfer.cpp @@ -29,7 +29,7 @@ #include <kurl.h> #include <tdemessagebox.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeaction.h> #include <kiconloader.h> #include <tdestandarddirs.h> @@ -779,7 +779,7 @@ void Transfer::logMessage(const TQString & message) -bool Transfer::read(KSimpleConfig * config, int id) +bool Transfer::read(TDESimpleConfig * config, int id) { sDebugIn << endl; @@ -815,7 +815,7 @@ bool Transfer::read(KSimpleConfig * config, int id) } -void Transfer::write(KSimpleConfig * config, int id) +void Transfer::write(TDESimpleConfig * config, int id) { sDebugIn << endl; diff --git a/kget/transfer.h b/kget/transfer.h index e0d44318..b48c0d58 100644 --- a/kget/transfer.h +++ b/kget/transfer.h @@ -40,7 +40,7 @@ class TQTimer; -class KSimpleConfig; +class TDESimpleConfig; class TDEAction; class TDERadioAction; @@ -72,8 +72,8 @@ public: void synchronousAbort(); - bool read(KSimpleConfig * config, int id); - void write(KSimpleConfig * config, int id); + bool read(TDESimpleConfig * config, int id); + void write(TDESimpleConfig * config, int id); void logMessage(const TQString & message); bool keepDialogOpen() const; diff --git a/kget/transferlist.cpp b/kget/transferlist.cpp index 17f0b743..b07c0270 100644 --- a/kget/transferlist.cpp +++ b/kget/transferlist.cpp @@ -31,7 +31,7 @@ #include <tdelocale.h> #include <tdeconfig.h> #include <tdemessagebox.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeio/netaccess.h> #include "transfer.h" @@ -230,7 +230,7 @@ void TransferList::readTransfers(const KURL& file) TQString tmpFile; if (TDEIO::NetAccess::download(file, tmpFile, (TQWidget*)parent())) { - KSimpleConfig config(tmpFile); + TDESimpleConfig config(tmpFile); config.setGroup("Common"); int num = config.readNumEntry("Count", 0); @@ -265,7 +265,7 @@ void TransferList::writeTransfers(const TQString& file) { sDebug << ">>>>Entering with file =" << file << endl; - KSimpleConfig config(file); + TDESimpleConfig config(file); int num = childCount(); config.setGroup("Common"); diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp index f0b7a1ce..a6ed1067 100644 --- a/kopete/libkopete/kopetepluginmanager.cpp +++ b/kopete/libkopete/kopetepluginmanager.cpp @@ -37,7 +37,7 @@ #include <kdebug.h> #include <tdeparts/componentfactory.h> #include <kplugininfo.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <kstaticdeleter.h> #include <kurl.h> diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp index 6fd6b7e1..4c726a53 100644 --- a/kopete/protocols/irc/ircprotocol.cpp +++ b/kopete/protocols/irc/ircprotocol.cpp @@ -49,7 +49,7 @@ #include <kinputdialog.h> #include <kiconloader.h> #include <tdemessagebox.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <kuser.h> diff --git a/kopete/protocols/oscar/icq/icqprotocol.cpp b/kopete/protocols/oscar/icq/icqprotocol.cpp index 543a2387..55b3670d 100644 --- a/kopete/protocols/oscar/icq/icqprotocol.cpp +++ b/kopete/protocols/oscar/icq/icqprotocol.cpp @@ -40,7 +40,7 @@ #include <kgenericfactory.h> #include <kdebug.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdemessagebox.h> #include "kopeteglobal.h" @@ -85,7 +85,7 @@ void ICQProtocolHandler::handleURL(const TQString &mimeType, const KURL & url) c * LastName= */ - KSimpleConfig file(url.path(), true); + TDESimpleConfig file(url.path(), true); if (file.hasGroup("ICQ User")) file.setGroup("ICQ User"); diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp index 4a0c978b..f4f6b45e 100644 --- a/kopete/protocols/winpopup/wpprotocol.cpp +++ b/kopete/protocols/winpopup/wpprotocol.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <tdemessagebox.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> // Kopete Includes diff --git a/kopete/protocols/winpopup/wpuserinfo.cpp b/kopete/protocols/winpopup/wpuserinfo.cpp index bfa05fcf..8b504a80 100644 --- a/kopete/protocols/winpopup/wpuserinfo.cpp +++ b/kopete/protocols/winpopup/wpuserinfo.cpp @@ -25,7 +25,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <klineedit.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> // Local Includes #include "wpuserinfo.h" diff --git a/kopete/protocols/yahoo/yahooprotocol.cpp b/kopete/protocols/yahoo/yahooprotocol.cpp index afd23cab..d988bdc8 100644 --- a/kopete/protocols/yahoo/yahooprotocol.cpp +++ b/kopete/protocols/yahoo/yahooprotocol.cpp @@ -21,7 +21,7 @@ /* KDE Includes */ #include <kdebug.h> #include <kgenericfactory.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> /* Local Includes */ #include "yahooprotocol.h" diff --git a/kppp/providerdb.cpp b/kppp/providerdb.cpp index 37dbcce9..60351e0b 100644 --- a/kppp/providerdb.cpp +++ b/kppp/providerdb.cpp @@ -41,7 +41,7 @@ #include "pppdata.h" #include <tqlistbox.h> #include <tqlineedit.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #define UNENCODED_CHARS "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_" @@ -130,7 +130,7 @@ void ProviderDB::loadProviderInfo() { TQString fname = locate("appdata", prov); kdDebug(5002) << "Providerfile=" << fname << endl; - cfg = new KSimpleConfig(fname, true); + cfg = new TDESimpleConfig(fname, true); } @@ -224,7 +224,7 @@ PDB_Country::PDB_Country(TQWidget *parent) : TQWidget(parent) { TQString dirFile(fi->absFilePath()+"/.directory"); TQString entryName; if(TQFile::exists(dirFile)){ - KSimpleConfig config(dirFile); + TDESimpleConfig config(dirFile); config.setDesktopGroup(); entryName = config.readEntry("Name"); } diff --git a/kppp/providerdb.h b/kppp/providerdb.h index 4e60baa7..f7a64201 100644 --- a/kppp/providerdb.h +++ b/kppp/providerdb.h @@ -40,7 +40,7 @@ class TQLineEdit; class TQListBox; -class KSimpleConfig; +class TDESimpleConfig; class PDB_Intro : public TQWidget { TQ_OBJECT @@ -136,7 +136,7 @@ public slots: private: void loadProviderInfo(); - KSimpleConfig *cfg; + TDESimpleConfig *cfg; PDB_Intro *page1; PDB_Country *page2; diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp index b50cde3d..7f7ec081 100644 --- a/krdc/krdc.cpp +++ b/krdc/krdc.cpp @@ -33,6 +33,7 @@ #include <tdemessagebox.h> #include <twin.h> #include <tdestartupinfo.h> +#include <tqclipboard.h> #include <tqdockarea.h> #include <tqlabel.h> @@ -51,6 +52,7 @@ const int FS_HOSTLABEL_ID = 4; const int FS_ADVANCED_ID = 5; const int FS_ICONIFY_ID = 6; const int FS_CLOSE_ID = 7; +const int FS_PASTE_ID = 8; const int KRDC::TOOLBAR_AUTOHIDE_TIMEOUT = 1000; const int KRDC::TOOLBAR_FPS_1000 = 10000; @@ -373,6 +375,13 @@ void KRDC::enableFullscreen(bool on) m_view->switchFullscreen(on); } +void KRDC::paste() +{ + TQClipboard *cb = TQApplication::clipboard(); + TQString text = cb->text(TQClipboard::Clipboard); + m_view->sendString(text); +} + TQSize KRDC::sizeHint() { if ((m_isFullscreen != WINDOW_MODE_FULLSCREEN) && m_toolbar) { @@ -499,6 +508,14 @@ void KRDC::switchToFullscreen(bool scaling) t->setButton(FS_FULLSCREEN_ID, true); t->addConnection(FS_FULLSCREEN_ID, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(enableFullscreen(bool))); + if(m_view->supportsSendString()) + { + t->insertButton("edit-paste", FS_PASTE_ID); + TDEToolBarButton *pasteButton = t->getButton(FS_PASTE_ID); + TQToolTip::add(pasteButton, i18n("Sends clipboard text to the remote system as key presses")); + t->addConnection(FS_PASTE_ID, TQ_SIGNAL(clicked()), this, TQ_SLOT(paste())); + } + m_popup = createPopupMenu(t); t->insertButton("configure", FS_ADVANCED_ID, m_popup, true, i18n("Advanced options")); TDEToolBarButton *advancedButton = t->getButton(FS_ADVANCED_ID); @@ -621,6 +638,14 @@ void KRDC::switchToNormal(bool scaling) m_popup = 0; } + if(m_view->supportsSendString()) + { + t->insertButton("edit-paste", 4, true, i18n("Paste")); + TDEToolBarButton *pasteButton = t->getButton(4); + TQToolTip::add(pasteButton, i18n("Sends clipboard text to the remote system as key presses")); + t->addConnection(4, TQ_SIGNAL(clicked()), this, TQ_SLOT(paste())); + } + m_popup = createPopupMenu(t); t->insertButton("configure", 3, m_popup, true, i18n("Advanced")); TDEToolBarButton *advancedButton = t->getButton(3); diff --git a/krdc/krdc.h b/krdc/krdc.h index b84741d9..b72a5378 100644 --- a/krdc/krdc.h +++ b/krdc/krdc.h @@ -163,6 +163,7 @@ private slots: public slots: void quit(); void enableFullscreen(bool full = false); + void paste(); void switchToNormal(bool scaling = false); void switchToFullscreen(bool scaling = false); void viewOnlyToggled(); diff --git a/krdc/kremoteview.cpp b/krdc/kremoteview.cpp index 76ae6267..e53fb918 100644 --- a/krdc/kremoteview.cpp +++ b/krdc/kremoteview.cpp @@ -86,4 +86,10 @@ void KRemoteView::enableScaling(bool) { void KRemoteView::switchFullscreen(bool) { } +bool KRemoteView::supportsSendString() const { + return false; +} + +void KRemoteView::sendString(const TQString &s) {} + #include "kremoteview.moc" diff --git a/krdc/kremoteview.h b/krdc/kremoteview.h index 9510153f..a735ebe0 100644 --- a/krdc/kremoteview.h +++ b/krdc/kremoteview.h @@ -227,6 +227,18 @@ public slots: */ virtual void pressKey(XEvent *k) = 0; + /** + * Checks whether the backend sending a string of characters. + * Default implementation returns false. + */ + virtual bool supportsSendString() const; + + /** + * Sends a string of characters to the remote server as key presses. + * Default implementation does nothing. + */ + virtual void sendString(const TQString &s); + signals: /** * Emitted when the size of the remote screen changes. Also diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp index b4025c2d..3a69cdd2 100644 --- a/krdc/vnc/kvncview.cpp +++ b/krdc/vnc/kvncview.cpp @@ -645,6 +645,57 @@ void KVncView::pressKey(XEvent *xe) { m_mods.clear(); } +bool KVncView::supportsSendString() const +{ + return true; +} + +void KVncView::sendString(const TQString &s) +{ + if (m_status != REMOTE_VIEW_CONNECTED) + return; + if (m_viewOnly) + return; + + for(uint i = 0; i < s.length(); ++i) + { + /* X11 reserves keysyms 0x01000000 to 0x0110FFFF for Unicode code-points + * (see keysymdef.h). + */ + uint sym = s[i].unicode() + 0x01000000; + + /* Convert line breaks to return (enter). */ + if(s[i] == '\n') + { + sym = XK_Return; + } + + /* If the character is upper-case and below code-point 0x3000 (most western + * languages), assume the shift key is required (based on kkeyserver_x11.cpp). + */ + bool shift = false; + if(s[i].unicode() < 0x3000 && s[i].isLetter() && s[i].lower() != s[i].upper() && s[i] == s[i].upper()) + { + m_cthreadObject.queueKeyEvent(XK_Shift_L, true); + shift = true; + } + + m_cthreadObject.queueKeyEvent(sym, true); + m_cthreadObject.queueKeyEvent(sym, false); + + if(shift) + { + m_cthreadObject.queueKeyEvent(XK_Shift_L, false); + } + + #if 0 + fprintf(stderr, "Sent character: '%s' (sym = %u, shift = %s)\n", + (const char*)(TQString(s[i]).local8Bit()), + (unsigned)(sym), (shift ? "yes" : "no")); + #endif + } +} + bool KVncView::x11Event(XEvent *e) { bool pressed; if (e->type == KeyPress) diff --git a/krdc/vnc/kvncview.h b/krdc/vnc/kvncview.h index f62b8819..7737ba7f 100644 --- a/krdc/vnc/kvncview.h +++ b/krdc/vnc/kvncview.h @@ -114,6 +114,8 @@ public slots: virtual void enableScaling(bool s); virtual void setViewOnly(bool s); virtual void pressKey(XEvent *k); + virtual bool supportsSendString() const; + virtual void sendString(const TQString &s); private slots: diff --git a/ktalkd/kcmktalkd/answmachpage.cpp b/ktalkd/kcmktalkd/answmachpage.cpp index 5f7372db..b713723f 100644 --- a/ktalkd/kcmktalkd/answmachpage.cpp +++ b/ktalkd/kcmktalkd/answmachpage.cpp @@ -24,18 +24,18 @@ #include "answmachpage.h" -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <stdlib.h> #include <tdelocale.h> // for getenv KAnswmachPageConfig::KAnswmachPageConfig( TQWidget *parent, const char* name, - KSimpleConfig *_config) + TDESimpleConfig *_config) : TDECModule (parent, name) { if (!_config) { delete_config = true; - config = new KSimpleConfig("ktalkdrc"); + config = new TDESimpleConfig("ktalkdrc"); } else { delete_config = false; diff --git a/ktalkd/kcmktalkd/answmachpage.h b/ktalkd/kcmktalkd/answmachpage.h index d76d724d..0b4f8d49 100644 --- a/ktalkd/kcmktalkd/answmachpage.h +++ b/ktalkd/kcmktalkd/answmachpage.h @@ -37,7 +37,7 @@ #include <tdecmodule.h> -class KSimpleConfig; +class TDESimpleConfig; class KAnswmachPageConfig : public TDECModule { @@ -46,7 +46,7 @@ class KAnswmachPageConfig : public TDECModule public: KAnswmachPageConfig( TQWidget *parent=0, const char* name=0, - KSimpleConfig *config=0 ); + TDESimpleConfig *config=0 ); ~KAnswmachPageConfig( ); void load(); @@ -61,7 +61,7 @@ private slots: void slotChanged(); private: - KSimpleConfig *config; + TDESimpleConfig *config; bool delete_config; TQCheckBox *answmach_cb; diff --git a/ktalkd/kcmktalkd/forwmachpage.cpp b/ktalkd/kcmktalkd/forwmachpage.cpp index 20f09d4f..30d19f2a 100644 --- a/ktalkd/kcmktalkd/forwmachpage.cpp +++ b/ktalkd/kcmktalkd/forwmachpage.cpp @@ -23,16 +23,16 @@ #include "forwmachpage.h" -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdelocale.h> KForwmachPageConfig::KForwmachPageConfig( TQWidget *parent, const char* name, - KSimpleConfig *_config) + TDESimpleConfig *_config) : TDECModule (parent, name) { if (!_config) { delete_config = true; - config = new KSimpleConfig("ktalkdrc"); + config = new TDESimpleConfig("ktalkdrc"); } else { delete_config = false; diff --git a/ktalkd/kcmktalkd/forwmachpage.h b/ktalkd/kcmktalkd/forwmachpage.h index 16be13c4..2f558c59 100644 --- a/ktalkd/kcmktalkd/forwmachpage.h +++ b/ktalkd/kcmktalkd/forwmachpage.h @@ -37,7 +37,7 @@ #include <tdecmodule.h> -class KSimpleConfig; +class TDESimpleConfig; class KForwmachPageConfig : public TDECModule { @@ -46,7 +46,7 @@ class KForwmachPageConfig : public TDECModule public: KForwmachPageConfig( TQWidget *parent=0, const char* name=0, - KSimpleConfig *config=0); + TDESimpleConfig *config=0); ~KForwmachPageConfig( ); void load(); @@ -61,7 +61,7 @@ private slots: void slotChanged(); private: - KSimpleConfig *config; + TDESimpleConfig *config; bool delete_config; TQCheckBox *forwmach_cb; diff --git a/ktalkd/kcmktalkd/main.cpp b/ktalkd/kcmktalkd/main.cpp index d6987c7d..3c268e39 100644 --- a/ktalkd/kcmktalkd/main.cpp +++ b/ktalkd/kcmktalkd/main.cpp @@ -24,7 +24,7 @@ #include "soundpage.h" #include "answmachpage.h" #include "forwmachpage.h" -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdelocale.h> #include <tdeglobal.h> #include <tqtabwidget.h> @@ -33,8 +33,8 @@ KTalkdConfigModule::KTalkdConfigModule(TQWidget *parent, const char *name) : TDECModule(parent, name) { - config = new KSimpleConfig("ktalkdrc"); - announceconfig = new KSimpleConfig("ktalkannouncerc"); + config = new TDESimpleConfig("ktalkdrc"); + announceconfig = new TDESimpleConfig("ktalkannouncerc"); TQVBoxLayout *layout = new TQVBoxLayout(this); diff --git a/ktalkd/kcmktalkd/main.h b/ktalkd/kcmktalkd/main.h index 2d4223ba..7d10dc14 100644 --- a/ktalkd/kcmktalkd/main.h +++ b/ktalkd/kcmktalkd/main.h @@ -26,7 +26,7 @@ class TQTabWidget; -class KSimpleConfig; +class TDESimpleConfig; class KSoundPageConfig; class KAnswmachPageConfig; @@ -51,8 +51,8 @@ class KTalkdConfigModule : public TDECModule void resizeEvent(TQResizeEvent *); private: - KSimpleConfig *config; - KSimpleConfig *announceconfig; + TDESimpleConfig *config; + TDESimpleConfig *announceconfig; TQTabWidget *tab; diff --git a/ktalkd/kcmktalkd/soundpage.cpp b/ktalkd/kcmktalkd/soundpage.cpp index dab372ae..ff1a57df 100644 --- a/ktalkd/kcmktalkd/soundpage.cpp +++ b/ktalkd/kcmktalkd/soundpage.cpp @@ -33,7 +33,7 @@ #include <tqcheckbox.h> #include <klineedit.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <tdelocale.h> #include <kaudioplayer.h> @@ -45,13 +45,13 @@ /* Lots of stuff taken from syssound.cpp */ KSoundPageConfig::KSoundPageConfig( TQWidget *parent, const char* name, - KSimpleConfig *_config, KSimpleConfig *_announceconfig) + TDESimpleConfig *_config, TDESimpleConfig *_announceconfig) : TDECModule (parent, name) { if (!_config) { delete_config = true; - config = new KSimpleConfig("ktalkdrc"); - announceconfig = new KSimpleConfig(""); + config = new TDESimpleConfig("ktalkdrc"); + announceconfig = new TDESimpleConfig(""); } else { delete_config = false; diff --git a/ktalkd/kcmktalkd/soundpage.h b/ktalkd/kcmktalkd/soundpage.h index 8d99cefc..56cc3e4e 100644 --- a/ktalkd/kcmktalkd/soundpage.h +++ b/ktalkd/kcmktalkd/soundpage.h @@ -36,7 +36,7 @@ class TQDragMoveEvent; class TQDragEnterEvent; class TQDropEvent; -class KSimpleConfig; +class TDESimpleConfig; class KURLRequester; class TQCheckBox; class TQLabel; @@ -50,7 +50,7 @@ class KSoundPageConfig : public TDECModule public: KSoundPageConfig( TQWidget *parent=0, const char* name=0, - KSimpleConfig *config=0, KSimpleConfig *announceconfig=0); + TDESimpleConfig *config=0, TDESimpleConfig *announceconfig=0); ~KSoundPageConfig( ); void load(); @@ -69,8 +69,8 @@ private slots: void sound_listDropEvent(TQDropEvent* e); private: - KSimpleConfig *config; - KSimpleConfig *announceconfig; + TDESimpleConfig *config; + TDESimpleConfig *announceconfig; bool delete_config; TQLabel *extprg_label; diff --git a/translations/desktop_files/kopete-eventsrc/ru.po b/translations/desktop_files/kopete-eventsrc/ru.po index 63d2042b..f5d7f31b 100644 --- a/translations/desktop_files/kopete-eventsrc/ru.po +++ b/translations/desktop_files/kopete-eventsrc/ru.po @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# Andrei Stepanov <adem4ik@gmail.com>, 2023. +# Andrei Stepanov <adem4ik@gmail.com>, 2023, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-08 16:12+0200\n" -"PO-Revision-Date: 2023-06-18 07:16+0000\n" +"PO-Revision-Date: 2025-06-20 19:58+0000\n" "Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdenetwork/kopete-events/ru/>\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 4.17\n" +"X-Generator: Weblate 4.18.2\n" #. Comment #: kopete/eventsrc:3 @@ -166,12 +166,12 @@ msgstr "Возникла ошибка соединения" #. Name #: kopete/eventsrc:82 msgid "Connection Lost" -msgstr "Соединение утеряно" +msgstr "Соединение потеряно" #. Comment #: kopete/eventsrc:83 msgid "The connection has been lost" -msgstr "Разрыв соединения" +msgstr "Соединение было потеряно" #. Name #: kopete/eventsrc:87 diff --git a/wifi/kcmwifi/wificonfig.cpp b/wifi/kcmwifi/wificonfig.cpp index 6d529ea1..559eb087 100644 --- a/wifi/kcmwifi/wificonfig.cpp +++ b/wifi/kcmwifi/wificonfig.cpp @@ -19,7 +19,7 @@ #include <tqfile.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeglobal.h> #include <kdebug.h> #include <tdeprocio.h> @@ -187,7 +187,7 @@ WifiConfig *WifiConfig::instance() WifiConfig::WifiConfig() { //m_config = TDEGlobal::config(); - m_config = new KSimpleConfig( "kcmwifirc" ); + m_config = new TDESimpleConfig( "kcmwifirc" ); load(); } diff --git a/wifi/kcmwifi/wificonfig.h b/wifi/kcmwifi/wificonfig.h index 5a1ba44e..7f289cdf 100644 --- a/wifi/kcmwifi/wificonfig.h +++ b/wifi/kcmwifi/wificonfig.h @@ -26,7 +26,7 @@ #include "kcmwifi.h" class TDEConfig; -class KSimpleConfig; +class TDESimpleConfig; enum KeyStates { EMPTY=0, INVALID=1, HEX_64=2, HEX_128=3, HEX_256=4, STRING_64=5, STRING_128=6, STRING_256=7 }; @@ -119,7 +119,7 @@ class WifiConfig : TQObject private: WifiConfig(); - KSimpleConfig *m_config; + TDESimpleConfig *m_config; static WifiConfig *m_instance; TQString m_detectedInterface; }; |