From de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:02:02 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kioslave/remote/kdedmodule/CMakeLists.txt | 41 ------ kioslave/remote/kdedmodule/Makefile.am | 13 -- kioslave/remote/kdedmodule/remotedirnotify.cpp | 143 --------------------- kioslave/remote/kdedmodule/remotedirnotify.desktop | 117 ----------------- kioslave/remote/kdedmodule/remotedirnotify.h | 43 ------- .../remote/kdedmodule/remotedirnotifymodule.cpp | 37 ------ kioslave/remote/kdedmodule/remotedirnotifymodule.h | 36 ------ 7 files changed, 430 deletions(-) delete mode 100644 kioslave/remote/kdedmodule/CMakeLists.txt delete mode 100644 kioslave/remote/kdedmodule/Makefile.am delete mode 100644 kioslave/remote/kdedmodule/remotedirnotify.cpp delete mode 100644 kioslave/remote/kdedmodule/remotedirnotify.desktop delete mode 100644 kioslave/remote/kdedmodule/remotedirnotify.h delete mode 100644 kioslave/remote/kdedmodule/remotedirnotifymodule.cpp delete mode 100644 kioslave/remote/kdedmodule/remotedirnotifymodule.h (limited to 'kioslave/remote/kdedmodule') diff --git a/kioslave/remote/kdedmodule/CMakeLists.txt b/kioslave/remote/kdedmodule/CMakeLists.txt deleted file mode 100644 index 2db56916c..000000000 --- a/kioslave/remote/kdedmodule/CMakeLists.txt +++ /dev/null @@ -1,41 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} -) - -link_directories( - ${TQT_LIBRARY_DIRS} -) - - -##### other data ################################ - -install( FILES remotedirnotify.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) - - -##### kded_remotedirnotify (module) ############# - -set( target kded_remotedirnotify ) - -set( ${target}_SRCS - remotedirnotify.cpp remotedirnotify.skel - remotedirnotifymodule.cpp remotedirnotifymodule.skel -) - -tde_add_kpart( ${target} AUTOMOC - SOURCES ${${target}_SRCS} - LINK tdeinit_kded-shared - DESTINATION ${PLUGIN_INSTALL_DIR} -) diff --git a/kioslave/remote/kdedmodule/Makefile.am b/kioslave/remote/kdedmodule/Makefile.am deleted file mode 100644 index 61f4d2261..000000000 --- a/kioslave/remote/kdedmodule/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -kde_module_LTLIBRARIES = kded_remotedirnotify.la - -METASOURCES = AUTO -INCLUDES = $(all_includes) - -kded_remotedirnotify_la_SOURCES = remotedirnotify.cpp remotedirnotify.skel remotedirnotifymodule.cpp remotedirnotifymodule.skel -kded_remotedirnotify_la_LDFLAGS = $(all_libraries) -module -avoid-version -kded_remotedirnotify_la_LIBADD = $(LIB_KSYCOCA) - - -servicesdir = $(kde_servicesdir)/kded -services_DATA = remotedirnotify.desktop - diff --git a/kioslave/remote/kdedmodule/remotedirnotify.cpp b/kioslave/remote/kdedmodule/remotedirnotify.cpp deleted file mode 100644 index fa880b78b..000000000 --- a/kioslave/remote/kdedmodule/remotedirnotify.cpp +++ /dev/null @@ -1,143 +0,0 @@ -/* This file is part of the KDE Project - Copyright (c) 2004 Kévin Ottens - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "remotedirnotify.h" - -#include -#include -#include -#include -#include - -#include - -#include - -RemoteDirNotify::RemoteDirNotify() -{ - TDEGlobal::dirs()->addResourceType("remote_entries", - KStandardDirs::kde_default("data") + "remoteview"); - - TQString path = TDEGlobal::dirs()->saveLocation("remote_entries"); - m_baseURL.setPath(path); -} - -KURL RemoteDirNotify::toRemoteURL(const KURL &url) -{ - kdDebug(1220) << "RemoteDirNotify::toRemoteURL(" << url << ")" << endl; - if ( m_baseURL.isParentOf(url) ) - { - TQString path = KURL::relativePath(m_baseURL.path(), - url.path()); - KURL result("remote:/"+path); - result.cleanPath(); - kdDebug(1220) << "result => " << result << endl; - return result; - } - - kdDebug(1220) << "result => KURL()" << endl; - return KURL(); -} - -KURL::List RemoteDirNotify::toRemoteURLList(const KURL::List &list) -{ - KURL::List new_list; - - KURL::List::const_iterator it = list.begin(); - KURL::List::const_iterator end = list.end(); - - for (; it!=end; ++it) - { - KURL url = toRemoteURL(*it); - - if (url.isValid()) - { - new_list.append(url); - } - } - - return new_list; -} - -ASYNC RemoteDirNotify::FilesAdded(const KURL &directory) -{ - kdDebug(1220) << "RemoteDirNotify::FilesAdded" << endl; - - KURL new_dir = toRemoteURL(directory); - - if (new_dir.isValid()) - { - KDirNotify_stub notifier("*", "*"); - notifier.FilesAdded( new_dir ); - } -} - -// This hack is required because of the way we manage .desktop files with -// Forwarding Slaves, their URL is out of the ioslave (most remote:/ files -// have a file:/ based UDS_URL so that they are executed correctly. -// Hence, FilesRemoved and FilesChanged does nothing... We're forced to use -// FilesAdded to re-list the modified directory. -inline void evil_hack(const KURL::List &list) -{ - KDirNotify_stub notifier("*", "*"); - - KURL::List notified; - - KURL::List::const_iterator it = list.begin(); - KURL::List::const_iterator end = list.end(); - - for (; it!=end; ++it) - { - KURL url = (*it).upURL(); - - if (!notified.contains(url)) - { - notifier.FilesAdded(url); - notified.append(url); - } - } -} - - -ASYNC RemoteDirNotify::FilesRemoved(const KURL::List &fileList) -{ - kdDebug(1220) << "RemoteDirNotify::FilesRemoved" << endl; - - KURL::List new_list = toRemoteURLList(fileList); - - if (!new_list.isEmpty()) - { - //KDirNotify_stub notifier("*", "*"); - //notifier.FilesRemoved( new_list ); - evil_hack(new_list); - } -} - -ASYNC RemoteDirNotify::FilesChanged(const KURL::List &fileList) -{ - kdDebug(1220) << "RemoteDirNotify::FilesChanged" << endl; - - KURL::List new_list = toRemoteURLList(fileList); - - if (!new_list.isEmpty()) - { - //KDirNotify_stub notifier("*", "*"); - //notifier.FilesChanged( new_list ); - evil_hack(new_list); - } -} diff --git a/kioslave/remote/kdedmodule/remotedirnotify.desktop b/kioslave/remote/kdedmodule/remotedirnotify.desktop deleted file mode 100644 index 24cc5e73f..000000000 --- a/kioslave/remote/kdedmodule/remotedirnotify.desktop +++ /dev/null @@ -1,117 +0,0 @@ -[Desktop Entry] -Type=Service -Name=KDED Remote Base URL Notifier -Name[af]=KDED afgeleë URL inkennissteller -Name[be]=Праверка зменаў аддаленых файлаў KDED -Name[bs]=KDED udaljeno obavjeÅ¡tenje o baznom URLu -Name[ca]=Notificador d'URL de base remota KDED -Name[cs]=Démon upozorňování na vzdálená URL -Name[csb]=Dôwanié wiédzë ò daleczich URL-ach dlô KDED -Name[da]=KDED Ekstern basis-URL pÃ¥mindelser -Name[de]=Ãœberwachung für Dateien auf Fremdrechnern -Name[el]=Ειδοποιητής KDED για απομακÏυσμένη URL -Name[eo]=KDED Fora Bazo URL Atentigilo -Name[es]=Notificador de URL remota KDED -Name[et]=KDED mujalasuva URL-i teadustaja -Name[eu]=KDED urruneko URL oinarriaren iragarlea -Name[fa]=اخطاردهندۀ نشانی وب پایه دور KDED -Name[fi]=KDED:in etäverkko-osoitteen ilmaisin -Name[fr]=Notificateur d'URL distante KDED -Name[fy]=KDED ekstern basis-URL-adres melding -Name[gl]=KDED Notificador de Base de URL Remota -Name[hi]=केडीईडी रिमोट आधारित यूआरà¤à¤² नोटिफ़ायर -Name[hr]=KDED URL obavjeÅ¡tavanje udaljene baze -Name[hu]=Távoli alapcím-értesítÅ‘ -Name[is]=KDED fjarlægur grunnslóðartilkynnari -Name[it]=Notifica KDED Remote Base URL -Name[ja]=KDED リモート ベース URL 通知 -Name[kk]=Желідегі диÑкідегі Ó©Ð·Ð³ÐµÑ€Ñ–Ñ Ñ‚ÑƒÑ€Ð°Ð»Ñ‹ қулақтандыру -Name[ko]=KDED ì›ê²© 기반 URL 알리미 -Name[lt]=KDED nutolusio pagrindinio URL priminiklis -Name[lv]=KDED attÄlinÄtÄ URL bÄzes atgÄdinÄtÄjs -Name[ms]=Pemberitahu URL Pangkalan Jauh KDED -Name[nb]=KDED-pÃ¥minner for eksterne nettadresser -Name[nds]=KDED-Narichten för feern Basis-URLs -Name[ne]=KDED रिमोटमा आधारित यूआरà¤à¤² सूचक -Name[nl]=KDED extern basis-URL-adres notificatie -Name[nn]=KDED-pÃ¥minnar for eksterne nettadressar -Name[pa]=KDED ਰਿਮੋਟ ਅਧਾਰਿਤ URL ਸੂਚਨਾ -Name[pl]=Powiadamianie o zdalnych URL-ach dla KDED -Name[pt]=Notificador de URLs de Base Remotos do KDED -Name[pt_BR]=Serviço de Notificação da URL Remota -Name[ro]=Notificare KDED pentru URL distant de bază -Name[ru]=Проверка Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñетевых файлов -Name[rw]=Mumenyekanisha wa URL KDED Yakure Shingiro -Name[sk]=KDED notifikátor vzdialenej URL -Name[sl]=Obvestilnik KDED oddaljenega osnovnega URL-ja -Name[sr]=Обавештавач о удаљеном базном URL-у, KDED -Name[sr@Latn]=ObaveÅ¡tavaÄ o udaljenom baznom URL-u, KDED -Name[sv]=KDED-meddelande om fjärrbaswebbadresser -Name[ta]=KDED தொலைதூரம௠சாரà¯à®¨à¯à®¤ வலைமனை கà¯à®±à®¿à®ªà¯à®ªà®¾à®©à¯ -Name[th]=ตัวà¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸­à¸™ Remote Base URL KDED -Name[tr]=KDED Uzak Tabanlı URL Hatırlatıcı -Name[tt]=Çittäge URL Ãœzgärelü Beldergeçe -Name[uk]=Сповіщувач про віддалену оÑновну адреÑу (URL) Ð´Ð»Ñ KDED -Name[vi]=Trình thông báo URL trên mạng KDED -Name[wa]=Notifiaedje KDED d' URL di bÃ¥ze Ã¥ lon -Name[zh_CN]=KDED 远程基 URL 通知器 -Name[zh_TW]=KDED é ç«¯åŸºç¤Ž URL é€šçŸ¥ç¨‹å¼ -Comment=Provides change notification for network folders -Comment[ar]=يقدم إشعار عن التغيرات التي تحدث ÙÙŠ مجلدات الشبكة -Comment[ca]=Proporciona notificacions de canvi en carpetes de xarxa -Comment[ca@valencia]=Proporciona notificacions de canvi en carpetes de xarxa -Comment[cs]=Poskytuje oznamování o zmÄ›nách síťových složek -Comment[da]=Giver bekendtgørelse af ændringer af netværksmapper -Comment[de]=Benachrichtigt den Anwender über Änderungen an Dateien in Netzwerkordnern. -Comment[el]=ΠαÏέχει ειδοποιήσεις για αλλαγές στους φακέλους δικτÏου -Comment[en_GB]=Provides change notification for network folders -Comment[es]=Proporciona notificaciones visuales para carpetas de red -Comment[et]=Võrgukataloogide muutuste märguanded -Comment[eu]=Sareko karpeten aldaketa jakinarazpenak hornitzen ditu -Comment[fi]=Tarjoaa huomautuksia verkkokansioiden muutoksista -Comment[fr]=Fournit les notifications de modification pour les dossiers réseaux -Comment[fy]=Ferskaft feroaringsmelding foar netwurkmappen -Comment[ga]=Cuireann sé in iúl duit nuair a athraíonn fillteán líonra -Comment[he]=מספק שינוי התר×ות עבור תיקיות רשת -Comment[hr]=Omogućuje obavjeÅ¡tavanje o promjenama na mrežnim mapama -Comment[ia]=Il forni notification de cambio pro dossieres de rete -Comment[id]=Menyediakan notifikasi pengubahan untuk folder jaringan -Comment[is]=Tilkynningaforrit fyrir breytingar á fjartengdum netmöppum -Comment[it]=Dà notifiche dei cambiamenti per le cartelle di rete -Comment[ja]=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãƒ•ã‚©ãƒ«ãƒ€ã®å¤‰æ›´ã‚’通知 -Comment[kk]=Желідегі қапшықтар өзгеріÑтері туралы құлақтандыру -Comment[km]=ផ្ដល់​នូវ​កា​រជូនដំណឹង​ផ្លាស់ប្ដូរ​សម្រាប់​ážážâ€‹áž”ណ្ដាញ -Comment[kn]=ಜಾಲಭಂದ ಕಡತಕೋಶಗಳ ಬದಲಾವಣೆ ಸೂಚನೆಗಳನà³à²¨à³ ಒದಗಿಸà³à²¤à³à²¤à²¦à³†. -Comment[ko]=ë„¤íŠ¸ì›Œí¬ í´ë”ì˜ ë³€ê²½ ìƒí™©ì„ 안내합니다 -Comment[lt]=PraneÅ¡imai vartotojui apie pasikeitimus tinklo aplankuose -Comment[lv]=Paziņo par izmaiņÄm tÄ«kla mapÄ“s -Comment[ml]=ശൃംഖലയിലàµà´³àµà´³ അറകളàµà´Ÿàµ† മാറàµà´±à´‚ അറിയിയàµà´•àµà´•àµà´¨àµà´¨àµ -Comment[nb]=Gir endringsvarslinger for nettverksmapper -Comment[nds]=Stellt Bescheden över Ännern vun Nettwarkornern praat -Comment[nl]=Levert notificatie voor wijzigingen in netwerkmappen -Comment[nn]=Gjev endringsvarsel for nettverksmapper -Comment[pa]=ਨੈੱਟਵਰਕ ਫੋਲਡਰਾਂ ਲਈ ਬਦਲਾਅ ਸੂਚਨਾ ਦਿੰਦਾ ਹੈ -Comment[pl]=UdostÄ™pnia powiadomienia o zmianach w katalogach sieciowych -Comment[pt]=Fornece notificações de alterações para as pastas de rede -Comment[pt_BR]=Fornece notificações de alterações para pastas de rede -Comment[ru]=ОтÑлеживание изменений в Ñетевых папках -Comment[sk]=Poskytuje upozornenia o zmenách sieÅ¥ových prieÄinkov -Comment[sl]=Ponuja obvestila o spremembah omrežnih map -Comment[sr]=ИÑпоÑтавља обавештења о изменама у мрежним фаÑциклама -Comment[sr@ijekavian]=ИÑпоÑтавља обавјештења о измјенама у мрежним фаÑциклама -Comment[sr@ijekavianlatin]=Ispostavlja obavjeÅ¡tenja o izmjenama u mrežnim fasciklama -Comment[sr@latin]=Ispostavlja obaveÅ¡tenja o izmenama u mrežnim fasciklama -Comment[sv]=TillhandahÃ¥ller ändringsunderrättelser för nätverkskataloger -Comment[tg]=Огоҳиҳои тағйиротро дар феҳраÑтҳои шабака нишон медиҳад -Comment[th]=ทำà¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹ƒà¸«à¹‰à¸—ราบถึงความเปลี่ยนà¹à¸›à¸¥à¸‡à¸—ี่มีบนโฟลเดอร์บนเครือข่าย -Comment[tr]=AÄŸ dizinleri için deÄŸiÅŸim bildirimi saÄŸlar. -Comment[uk]=Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ зміну Ñтану мережевих тек -Comment[x-test]=xxProvides change notification for network foldersxx -Comment[zh_CN]=为网络文件夹æ供更改通知 -Comment[zh_TW]=æ供網路資料夾的變更通知 -ServiceTypes=KDEDModule -X-TDE-ModuleType=Library -X-TDE-Library=remotedirnotify -X-TDE-FactoryName=remotedirnotify -X-TDE-Kded-load-on-demand=true -X-TDE-Kded-autoload=true diff --git a/kioslave/remote/kdedmodule/remotedirnotify.h b/kioslave/remote/kdedmodule/remotedirnotify.h deleted file mode 100644 index 110d53a9d..000000000 --- a/kioslave/remote/kdedmodule/remotedirnotify.h +++ /dev/null @@ -1,43 +0,0 @@ -/* This file is part of the KDE Project - Copyright (c) 2004 Kévin Ottens - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef REMOTEDIRNOTIFY_H -#define REMOTEDIRNOTIFY_H - -#include -#include - -class RemoteDirNotify : public KDirNotify -{ -K_DCOP - -public: - RemoteDirNotify(); - -k_dcop: - virtual ASYNC FilesAdded (const KURL &directory); - virtual ASYNC FilesRemoved (const KURL::List &fileList); - virtual ASYNC FilesChanged (const KURL::List &fileList); - -private: - KURL toRemoteURL(const KURL &url); - KURL::List toRemoteURLList(const KURL::List &list); - KURL m_baseURL; -}; - -#endif diff --git a/kioslave/remote/kdedmodule/remotedirnotifymodule.cpp b/kioslave/remote/kdedmodule/remotedirnotifymodule.cpp deleted file mode 100644 index 13bfcfc29..000000000 --- a/kioslave/remote/kdedmodule/remotedirnotifymodule.cpp +++ /dev/null @@ -1,37 +0,0 @@ -/* This file is part of the KDE Project - Copyright (c) 2004 Kévin Ottens - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "remotedirnotifymodule.h" - -#include -#include -#include - -RemoteDirNotifyModule::RemoteDirNotifyModule(const TQCString &obj) - : KDEDModule(obj) -{ -} - -extern "C" { - KDE_EXPORT KDEDModule *create_remotedirnotify(const TQCString &obj) - { - TDEGlobal::locale()->insertCatalogue("kio_remote"); - return new RemoteDirNotifyModule(obj); - } -} - diff --git a/kioslave/remote/kdedmodule/remotedirnotifymodule.h b/kioslave/remote/kdedmodule/remotedirnotifymodule.h deleted file mode 100644 index e6cf0d720..000000000 --- a/kioslave/remote/kdedmodule/remotedirnotifymodule.h +++ /dev/null @@ -1,36 +0,0 @@ -/* This file is part of the KDE Project - Copyright (c) 2004 Kévin Ottens - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef REMOTEDIRNOTIFYMODULE_H -#define REMOTEDIRNOTIFYMODULE_H - -#include - -#include "remotedirnotify.h" - -class RemoteDirNotifyModule : public KDEDModule -{ -K_DCOP - -public: - RemoteDirNotifyModule(const TQCString &obj); -private: - RemoteDirNotify notifier; -}; - -#endif -- cgit v1.2.1