From 7b3be82ee4817e80ffb1f2516f97d0255dfed13e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 19:56:51 +0200 Subject: Additional k => tde renaming and fixes --- CMakeLists.txt | 2 +- admin | 2 +- configdialog/kbfxconfigapp.cpp | 12 ++++++------ configdialog/kbfxconfigapp.h | 2 +- kbfxlib/common/kbfxkiodownload.h | 4 ++-- plugins/common/kbfxplasmadataplugin-common.h | 2 +- plugins/strigi/kbfxstrigiplugin.h | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b69a4fd..0e58705 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ cmake_minimum_required( VERSION 2.8 ) ##### general package setup ##################### -project( kio-locate ) +project( kbfx ) ##### include essential cmake modules ########### diff --git a/admin b/admin index b4d585c..6b7f722 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360 +Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461 diff --git a/configdialog/kbfxconfigapp.cpp b/configdialog/kbfxconfigapp.cpp index 29f567d..fc31110 100644 --- a/configdialog/kbfxconfigapp.cpp +++ b/configdialog/kbfxconfigapp.cpp @@ -343,25 +343,25 @@ void KbfxConfigApp::KbfxNewsBrowserOpenURLRequest ( const KURL &url, const KPart void KbfxConfigApp::KbfxNewsBrowserCompleted() { - kio->KbfxKioDownloadEnd(); + tdeio->KbfxKioDownloadEnd(); } void KbfxConfigApp::browserInit() { /* initialize NewsBrowser widget */ - kio = new KbfxKioDownload(); - connect ( kio, TQT_SIGNAL ( KbfxKioDownloadReady() ), + tdeio = new KbfxKioDownload(); + connect ( tdeio, TQT_SIGNAL ( KbfxKioDownloadReady() ), this, TQT_SLOT ( KbfxNewsBrowserLoad() ) ); - kio->KbfxKioDownloadStart ( m_KbfxNewsBrowserAddress ); + tdeio->KbfxKioDownloadStart ( m_KbfxNewsBrowserAddress ); } void KbfxConfigApp::KbfxNewsBrowserLoad() { - if ( kio->KbfxBrowserError() ) KBFXNewsBrowser->setText ( m_KbfxNewsBrowserError ); + if ( tdeio->KbfxBrowserError() ) KBFXNewsBrowser->setText ( m_KbfxNewsBrowserError ); else { browser = new TDEHTMLPart ( KBFXNewsBrowser ); - browser->openURL ( kio->KbfxBrowserTmpFile() ); + browser->openURL ( tdeio->KbfxBrowserTmpFile() ); browser->view()->resize ( KBFXNewsBrowser->width(), KBFXNewsBrowser->height() ); browser->view()->setVScrollBarMode ( TQScrollView::AlwaysOff ); browser->view()->setHScrollBarMode ( TQScrollView::AlwaysOff ); diff --git a/configdialog/kbfxconfigapp.h b/configdialog/kbfxconfigapp.h index 506dc8e..ffcd6b1 100644 --- a/configdialog/kbfxconfigapp.h +++ b/configdialog/kbfxconfigapp.h @@ -128,7 +128,7 @@ class KbfxConfigApp : public KbfxConfigDlgMain KbfxConfigDlgTooltip *pageTooltip; KbfxConfigDlgAbout *pageAbout; TDEHTMLPart * browser; - KbfxKioDownload * kio; + KbfxKioDownload * tdeio; TQString m_KbfxThemeUrl; TQString m_KbfxThemeFolderUrl; int m_KbfxPage; diff --git a/kbfxlib/common/kbfxkiodownload.h b/kbfxlib/common/kbfxkiodownload.h index 2878678..12535bd 100644 --- a/kbfxlib/common/kbfxkiodownload.h +++ b/kbfxlib/common/kbfxkiodownload.h @@ -19,8 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KBFX_KIO_DOWNLOAD_H -#define KBFX_KIO_DOWNLOAD_H +#ifndef KBFX_TDEIO_DOWNLOAD_H +#define KBFX_TDEIO_DOWNLOAD_H #include #include diff --git a/plugins/common/kbfxplasmadataplugin-common.h b/plugins/common/kbfxplasmadataplugin-common.h index 8777216..699cd61 100644 --- a/plugins/common/kbfxplasmadataplugin-common.h +++ b/plugins/common/kbfxplasmadataplugin-common.h @@ -29,7 +29,7 @@ extern "C" // static TQString check = "Static Check for Plugin"; KbfxDataStack * view(); TQString name(); //Name of the Plugin My Music .if TOM Create..Configure .. - TQString type(); //Type of the plugin ex: Application : Amork : kio ..etc + TQString type(); //Type of the plugin ex: Application : Amork : tdeio ..etc uint id(); //A id for menus KbfxDataGroup * search ( TQString str ); } diff --git a/plugins/strigi/kbfxstrigiplugin.h b/plugins/strigi/kbfxstrigiplugin.h index 5028593..b0707f8 100644 --- a/plugins/strigi/kbfxstrigiplugin.h +++ b/plugins/strigi/kbfxstrigiplugin.h @@ -33,7 +33,7 @@ extern "C" { KbfxDataStack * view(); TQString name(); //Name of the Plugin My Music .if TOM Create..Configure .. - TQString type(); //Type of the plugin ex: Application : Amork : kio ..etc + TQString type(); //Type of the plugin ex: Application : Amork : tdeio ..etc uint id(); //A id for menus KbfxDataGroup * search ( TQString str ); // KbfxPlasmaCanvasGroup * search(TQString _keyword,TQCanvas * canvas); //search and return a group -- cgit v1.2.1