diff --git a/frontend/control/create-index-ask-dialog.cpp b/frontend/control/create-index-ask-dialog.cpp index 6488a7c..57851ee 100644 --- a/frontend/control/create-index-ask-dialog.cpp +++ b/frontend/control/create-index-ask-dialog.cpp @@ -34,7 +34,7 @@ #define BTN_FRAME_MARGINS 0,0,0,0 #define CONTENT_MARGINS 32,0,32,24 -using namespace Zeeker; +using namespace UkuiSearch; CreateIndexAskDialog::CreateIndexAskDialog(QWidget *parent) : QDialog(parent) { // this->setWindowIcon(QIcon::fromTheme("kylin-search")); this->setWindowTitle(tr("ukui-search")); diff --git a/frontend/control/create-index-ask-dialog.h b/frontend/control/create-index-ask-dialog.h index 4719181..a59c5f2 100644 --- a/frontend/control/create-index-ask-dialog.h +++ b/frontend/control/create-index-ask-dialog.h @@ -33,7 +33,7 @@ #include #include -namespace Zeeker { +namespace UkuiSearch { class CreateIndexAskDialog : public QDialog { Q_OBJECT public: diff --git a/frontend/control/list-labels/show-more-label.cpp b/frontend/control/list-labels/show-more-label.cpp index ee1d7c8..35e9fe5 100644 --- a/frontend/control/list-labels/show-more-label.cpp +++ b/frontend/control/list-labels/show-more-label.cpp @@ -22,7 +22,7 @@ #include #include #include -using namespace Zeeker; +using namespace UkuiSearch; ShowMoreLabel::ShowMoreLabel(QWidget *parent) : QWidget(parent) { initUi(); m_timer = new QTimer; diff --git a/frontend/control/list-labels/show-more-label.h b/frontend/control/list-labels/show-more-label.h index 3689a39..ca14931 100644 --- a/frontend/control/list-labels/show-more-label.h +++ b/frontend/control/list-labels/show-more-label.h @@ -26,7 +26,7 @@ #include #include -namespace Zeeker { +namespace UkuiSearch { class ShowMoreLabel : public QWidget { Q_OBJECT public: diff --git a/frontend/control/list-labels/title-label.cpp b/frontend/control/list-labels/title-label.cpp index 03d404e..a4e2c87 100644 --- a/frontend/control/list-labels/title-label.cpp +++ b/frontend/control/list-labels/title-label.cpp @@ -23,7 +23,7 @@ #include #define UNFOLD_LABEL_HEIGHT 30 #define NUM_LIMIT_SHOWN_DEFAULT 5 -using namespace Zeeker; +using namespace UkuiSearch; TitleLabel::TitleLabel(QWidget * parent) : QLabel(parent) { initUi(); initConnections(); diff --git a/frontend/control/list-labels/title-label.h b/frontend/control/list-labels/title-label.h index 4527980..0fee1b3 100644 --- a/frontend/control/list-labels/title-label.h +++ b/frontend/control/list-labels/title-label.h @@ -25,7 +25,7 @@ #include "show-more-label.h" #include -namespace Zeeker { +namespace UkuiSearch { class TitleLabel : public QLabel { Q_OBJECT public: diff --git a/frontend/control/search-line-edit.cpp b/frontend/control/search-line-edit.cpp index b17f8c7..a3d02fc 100644 --- a/frontend/control/search-line-edit.cpp +++ b/frontend/control/search-line-edit.cpp @@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed); QT_END_NAMESPACE -using namespace Zeeker; +using namespace UkuiSearch; /** * @brief UKuiSearchLineEdit 全局搜索的输入框 */ diff --git a/frontend/control/search-line-edit.h b/frontend/control/search-line-edit.h index c83181d..a6c4768 100644 --- a/frontend/control/search-line-edit.h +++ b/frontend/control/search-line-edit.h @@ -36,7 +36,7 @@ #include #include "global-settings.h" -namespace Zeeker { +namespace UkuiSearch { class SearchLineEdit : public QLineEdit { Q_OBJECT diff --git a/frontend/control/settings-widget.cpp b/frontend/control/settings-widget.cpp index 8710126..1873acb 100644 --- a/frontend/control/settings-widget.cpp +++ b/frontend/control/settings-widget.cpp @@ -28,7 +28,7 @@ #include "global-settings.h" #include "file-utils.h" -using namespace Zeeker; +using namespace UkuiSearch; extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed); SettingsWidget::SettingsWidget(QWidget *parent) : QWidget(parent) { // this->setWindowIcon(QIcon::fromTheme("kylin-search")); diff --git a/frontend/control/settings-widget.h b/frontend/control/settings-widget.h index 2f4ef05..984d352 100644 --- a/frontend/control/settings-widget.h +++ b/frontend/control/settings-widget.h @@ -37,7 +37,7 @@ #include "xatom-helper.h" #endif -namespace Zeeker { +namespace UkuiSearch { class FolderListItem : public QWidget { Q_OBJECT public: diff --git a/frontend/control/stack-pages/search-page-section.cpp b/frontend/control/stack-pages/search-page-section.cpp index b59b419..a9ae6e9 100644 --- a/frontend/control/stack-pages/search-page-section.cpp +++ b/frontend/control/stack-pages/search-page-section.cpp @@ -21,7 +21,7 @@ #include "search-page-section.h" #include #include -using namespace Zeeker; +using namespace UkuiSearch; #define RESULT_LAYOUT_MARGINS 0,0,0,0 #define RESULT_BACKGROUND_COLOR QColor(0, 0, 0, 0) diff --git a/frontend/control/stack-pages/search-page-section.h b/frontend/control/stack-pages/search-page-section.h index 7df5659..66419b4 100644 --- a/frontend/control/stack-pages/search-page-section.h +++ b/frontend/control/stack-pages/search-page-section.h @@ -29,7 +29,7 @@ #include "best-list-view.h" #include "web-search-view.h" -namespace Zeeker { +namespace UkuiSearch { class ResultArea : public QScrollArea { Q_OBJECT diff --git a/frontend/control/stack-pages/search-result-page.cpp b/frontend/control/stack-pages/search-result-page.cpp index c12435c..99bd48b 100644 --- a/frontend/control/stack-pages/search-result-page.cpp +++ b/frontend/control/stack-pages/search-result-page.cpp @@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed); QT_END_NAMESPACE -using namespace Zeeker; +using namespace UkuiSearch; #define RESULT_WIDTH 266 #define DETAIL_WIDTH 374 diff --git a/frontend/control/stack-pages/search-result-page.h b/frontend/control/stack-pages/search-result-page.h index 9f4a7f3..1c1d42f 100644 --- a/frontend/control/stack-pages/search-result-page.h +++ b/frontend/control/stack-pages/search-result-page.h @@ -24,7 +24,7 @@ #include #include "search-page-section.h" -namespace Zeeker { +namespace UkuiSearch { class SearchResultPage : public QWidget { Q_OBJECT diff --git a/frontend/main.cpp b/frontend/main.cpp index 474d24d..591fc52 100644 --- a/frontend/main.cpp +++ b/frontend/main.cpp @@ -41,7 +41,7 @@ #include "plugin-manager.h" #include -using namespace Zeeker; +using namespace UkuiSearch; void messageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) { diff --git a/frontend/mainwindow.cpp b/frontend/mainwindow.cpp index abffb9f..761075f 100644 --- a/frontend/mainwindow.cpp +++ b/frontend/mainwindow.cpp @@ -51,7 +51,7 @@ #define ASK_INDEX_TIME 5*1000 #define RESEARCH_TIME 10*1000 -using namespace Zeeker; +using namespace UkuiSearch; extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed); /** * @brief MainWindow 主界面 diff --git a/frontend/mainwindow.h b/frontend/mainwindow.h index 97e6822..bbe9ca8 100644 --- a/frontend/mainwindow.h +++ b/frontend/mainwindow.h @@ -58,7 +58,7 @@ #include "settings-widget.h" #endif -namespace Zeeker { +namespace UkuiSearch { class SearchResult; class MainWindow : public QMainWindow { friend class SearchResult; diff --git a/frontend/model/best-list-model.cpp b/frontend/model/best-list-model.cpp index 630c9e0..078d7be 100644 --- a/frontend/model/best-list-model.cpp +++ b/frontend/model/best-list-model.cpp @@ -20,7 +20,7 @@ */ #include "best-list-model.h" #include "search-plugin-manager.h" -using namespace Zeeker; +using namespace UkuiSearch; BestListModel::BestListModel(QObject *parent) : QAbstractItemModel(parent) diff --git a/frontend/model/best-list-model.h b/frontend/model/best-list-model.h index dc04d58..d38af16 100644 --- a/frontend/model/best-list-model.h +++ b/frontend/model/best-list-model.h @@ -6,7 +6,7 @@ #define NUM_LIMIT_SHOWN_DEFAULT 5 -namespace Zeeker { +namespace UkuiSearch { class BestListModel : public QAbstractItemModel { Q_OBJECT diff --git a/frontend/model/search-result-manager.cpp b/frontend/model/search-result-manager.cpp index 0536184..ea36eed 100644 --- a/frontend/model/search-result-manager.cpp +++ b/frontend/model/search-result-manager.cpp @@ -20,7 +20,7 @@ */ #include "search-result-manager.h" -using namespace Zeeker; +using namespace UkuiSearch; SearchResultManager::SearchResultManager(const QString& plugin_id, QObject *parent) : QObject(parent) { m_plugin_id = plugin_id; diff --git a/frontend/model/search-result-manager.h b/frontend/model/search-result-manager.h index ada728f..0c82525 100644 --- a/frontend/model/search-result-manager.h +++ b/frontend/model/search-result-manager.h @@ -27,7 +27,7 @@ #include #include "pluginmanage/search-plugin-manager.h" -namespace Zeeker { +namespace UkuiSearch { class ReceiveResultThread : public QThread { Q_OBJECT diff --git a/frontend/model/search-result-model.cpp b/frontend/model/search-result-model.cpp index f6aa0a8..46b59e7 100644 --- a/frontend/model/search-result-model.cpp +++ b/frontend/model/search-result-model.cpp @@ -19,7 +19,7 @@ * */ #include "search-result-model.h" -using namespace Zeeker; +using namespace UkuiSearch; SearchResultModel::SearchResultModel(const QString &plugin_id) { diff --git a/frontend/model/search-result-model.h b/frontend/model/search-result-model.h index ad3e4bb..5db61e7 100644 --- a/frontend/model/search-result-model.h +++ b/frontend/model/search-result-model.h @@ -25,7 +25,7 @@ #define NUM_LIMIT_SHOWN_DEFAULT 5 -namespace Zeeker { +namespace UkuiSearch { class SearchResultItem : public QObject { friend class SearchResultModel; diff --git a/frontend/model/web-search-model.cpp b/frontend/model/web-search-model.cpp index 22fc8be..43aec61 100644 --- a/frontend/model/web-search-model.cpp +++ b/frontend/model/web-search-model.cpp @@ -21,7 +21,7 @@ #include "web-search-model.h" #include -using namespace Zeeker; +using namespace UkuiSearch; WebSearchModel::WebSearchModel(QObject *parent) : QAbstractItemModel(parent) { diff --git a/frontend/model/web-search-model.h b/frontend/model/web-search-model.h index 014d2a8..7e14bbf 100644 --- a/frontend/model/web-search-model.h +++ b/frontend/model/web-search-model.h @@ -6,7 +6,7 @@ #include #include "search-result-model.h" -namespace Zeeker { +namespace UkuiSearch { class WebSearchModel : public QAbstractItemModel { Q_OBJECT diff --git a/frontend/ukui-search-dbus-service.cpp b/frontend/ukui-search-dbus-service.cpp index 538ca2d..7a29e83 100644 --- a/frontend/ukui-search-dbus-service.cpp +++ b/frontend/ukui-search-dbus-service.cpp @@ -1,6 +1,6 @@ #include "ukui-search-dbus-service.h" -using namespace Zeeker; +using namespace UkuiSearch; void UkuiSearchDbusServices::showWindow(){ qDebug() << "showWindow called"; m_mainWindow->bootOptionsFilter("-s"); diff --git a/frontend/ukui-search-dbus-service.h b/frontend/ukui-search-dbus-service.h index 4adda09..d3d13be 100644 --- a/frontend/ukui-search-dbus-service.h +++ b/frontend/ukui-search-dbus-service.h @@ -6,7 +6,7 @@ #include "mainwindow.h" -namespace Zeeker { +namespace UkuiSearch { class UkuiSearchDbusServices: public QObject{ Q_OBJECT diff --git a/frontend/view/best-list-view.cpp b/frontend/view/best-list-view.cpp index 704ecb9..6dca71a 100644 --- a/frontend/view/best-list-view.cpp +++ b/frontend/view/best-list-view.cpp @@ -5,7 +5,7 @@ #define UNFOLD_LABEL_HEIGHT 30 #define VIEW_ICON_SIZE 24 -using namespace Zeeker; +using namespace UkuiSearch; BestListView::BestListView(QWidget *parent) : QTreeView(parent) { this->setFrameShape(QFrame::NoFrame); diff --git a/frontend/view/best-list-view.h b/frontend/view/best-list-view.h index 1b5d22c..d07767d 100644 --- a/frontend/view/best-list-view.h +++ b/frontend/view/best-list-view.h @@ -10,7 +10,7 @@ #include "title-label.h" #include "result-view-delegate.h" -namespace Zeeker { +namespace UkuiSearch { class BestListView : public QTreeView { diff --git a/frontend/view/result-view-delegate.cpp b/frontend/view/result-view-delegate.cpp index 724457f..0423a5e 100644 --- a/frontend/view/result-view-delegate.cpp +++ b/frontend/view/result-view-delegate.cpp @@ -1,5 +1,5 @@ #include "result-view-delegate.h" -using namespace Zeeker; +using namespace UkuiSearch; ResultViewDelegate::ResultViewDelegate(QObject *parent) : QStyledItemDelegate(parent) { diff --git a/frontend/view/result-view-delegate.h b/frontend/view/result-view-delegate.h index 7dcd1af..5182fdb 100644 --- a/frontend/view/result-view-delegate.h +++ b/frontend/view/result-view-delegate.h @@ -28,7 +28,7 @@ #include #include "global-settings.h" -namespace Zeeker { +namespace UkuiSearch { class ResultViewDelegate : public QStyledItemDelegate { Q_OBJECT public: diff --git a/frontend/view/result-view.cpp b/frontend/view/result-view.cpp index 9f47df5..605b12a 100644 --- a/frontend/view/result-view.cpp +++ b/frontend/view/result-view.cpp @@ -5,7 +5,7 @@ #define UNFOLD_LABEL_HEIGHT 30 #define VIEW_ICON_SIZE 24 -using namespace Zeeker; +using namespace UkuiSearch; ResultWidget::ResultWidget(const QString &plugin_id, QWidget *parent) : QWidget(parent) { m_plugin_id = plugin_id; diff --git a/frontend/view/result-view.h b/frontend/view/result-view.h index 97343d8..5ede217 100644 --- a/frontend/view/result-view.h +++ b/frontend/view/result-view.h @@ -10,7 +10,7 @@ #include "title-label.h" #include "result-view-delegate.h" -namespace Zeeker { +namespace UkuiSearch { class ResultView : public QTreeView { diff --git a/frontend/view/web-search-view.cpp b/frontend/view/web-search-view.cpp index 1eaf112..dc15f8d 100644 --- a/frontend/view/web-search-view.cpp +++ b/frontend/view/web-search-view.cpp @@ -24,7 +24,7 @@ #define TITLE_HEIGHT 30 #define VIEW_ICON_SIZE 24 -using namespace Zeeker; +using namespace UkuiSearch; WebSearchView::WebSearchView(QWidget *parent) : QTreeView(parent) { this->setFrameShape(QFrame::NoFrame); diff --git a/frontend/view/web-search-view.h b/frontend/view/web-search-view.h index 4640f01..61dffe9 100644 --- a/frontend/view/web-search-view.h +++ b/frontend/view/web-search-view.h @@ -7,7 +7,7 @@ #include "result-view-delegate.h" #include "title-label.h" -namespace Zeeker { +namespace UkuiSearch { class WebSearchView : public QTreeView { Q_OBJECT diff --git a/libsearch/appsearch/app-match.cpp b/libsearch/appsearch/app-match.cpp index c24e20e..176ce37 100644 --- a/libsearch/appsearch/app-match.cpp +++ b/libsearch/appsearch/app-match.cpp @@ -24,7 +24,7 @@ #include "file-utils.h" #include "app-search-plugin.h" #define ANDROID_APP_DESKTOP_PATH QDir::homePath() + "/.local/share/applications/" -using namespace Zeeker; +using namespace UkuiSearch; static AppMatch *app_match_Class = nullptr; AppMatch *AppMatch::getAppMatch() { diff --git a/libsearch/appsearch/app-match.h b/libsearch/appsearch/app-match.h index 334553f..f4a95e8 100644 --- a/libsearch/appsearch/app-match.h +++ b/libsearch/appsearch/app-match.h @@ -29,7 +29,7 @@ #include #include #include "search-plugin-iface.h" -namespace Zeeker { +namespace UkuiSearch { class NameString { public: explicit NameString(const QString &str_) : app_name(str_) {} diff --git a/libsearch/appsearch/app-search-plugin.cpp b/libsearch/appsearch/app-search-plugin.cpp index a31e07a..a6fc80d 100644 --- a/libsearch/appsearch/app-search-plugin.cpp +++ b/libsearch/appsearch/app-search-plugin.cpp @@ -3,7 +3,7 @@ #include #include #include "file-utils.h" -using namespace Zeeker; +using namespace UkuiSearch; size_t AppSearchPlugin::uniqueSymbol = 0; QMutex AppSearchPlugin::m_mutex; AppSearchPlugin::AppSearchPlugin(QObject *parent) : QObject(parent) diff --git a/libsearch/appsearch/app-search-plugin.h b/libsearch/appsearch/app-search-plugin.h index 2415b6a..94e728f 100644 --- a/libsearch/appsearch/app-search-plugin.h +++ b/libsearch/appsearch/app-search-plugin.h @@ -12,7 +12,7 @@ #include "app-match.h" #include "action-label.h" #include "libsearch_global.h" -namespace Zeeker { +namespace UkuiSearch { class LIBSEARCH_EXPORT AppSearchPlugin : public QObject, public SearchPluginIface { friend class AppSearch; diff --git a/libsearch/file-utils.cpp b/libsearch/file-utils.cpp index 30ce85d..3cf12f7 100644 --- a/libsearch/file-utils.cpp +++ b/libsearch/file-utils.cpp @@ -28,7 +28,7 @@ #include #include "gobject-template.h" -using namespace Zeeker; +using namespace UkuiSearch; size_t FileUtils::_max_index_count = 0; size_t FileUtils::_current_index_count = 0; unsigned short FileUtils::indexStatus = 0; diff --git a/libsearch/file-utils.h b/libsearch/file-utils.h index 2479f39..1d7e6ce 100644 --- a/libsearch/file-utils.h +++ b/libsearch/file-utils.h @@ -59,7 +59,7 @@ //#define CREATING_INDEX 1 //#define FINISH_CREATING_INDEX 2 #define MAX_CONTENT_LENGTH 20480000 -namespace Zeeker { +namespace UkuiSearch { class LIBSEARCH_EXPORT FileUtils { public: static QString getHtmlText(const QString & text, const QString & keyword); diff --git a/libsearch/global-settings.cpp b/libsearch/global-settings.cpp index 3aebc89..03f87a3 100644 --- a/libsearch/global-settings.cpp +++ b/libsearch/global-settings.cpp @@ -22,7 +22,7 @@ #include #include "global-settings.h" -using namespace Zeeker; +using namespace UkuiSearch; static GlobalSettings *global_instance_of_global_settings = nullptr; GlobalSettings *GlobalSettings::getInstance() { diff --git a/libsearch/global-settings.h b/libsearch/global-settings.h index de520ab..fc643b9 100644 --- a/libsearch/global-settings.h +++ b/libsearch/global-settings.h @@ -57,7 +57,7 @@ //#define CLOUD_HISTORY "history" //#define CLOUD_APPLICATIONS "applications" -namespace Zeeker { +namespace UkuiSearch { class LIBSEARCH_EXPORT GlobalSettings : public QObject { Q_OBJECT public: diff --git a/libsearch/index/construct-document.cpp b/libsearch/index/construct-document.cpp index 5c66a8a..0a31189 100644 --- a/libsearch/index/construct-document.cpp +++ b/libsearch/index/construct-document.cpp @@ -26,7 +26,7 @@ //extern QList *g_docListForPath; //extern QMutex g_mutexDocListForPath; -using namespace Zeeker; +using namespace UkuiSearch; ConstructDocumentForPath::ConstructDocumentForPath(QVector list) { this->setAutoDelete(true); m_list = std::move(list); @@ -34,8 +34,8 @@ ConstructDocumentForPath::ConstructDocumentForPath(QVector list) { void ConstructDocumentForPath::run() { // qDebug()<<"ConstructDocumentForPath"; -// if(!Zeeker::g_docListForPath) -// Zeeker::g_docListForPath = new QVector; +// if(!UkuiSearch::g_docListForPath) +// UkuiSearch::g_docListForPath = new QVector; // qDebug()<size(); QString index_text = m_list.at(0).toLower(); QString sourcePath = m_list.at(1); diff --git a/libsearch/index/construct-document.h b/libsearch/index/construct-document.h index a3ccfce..99c776e 100644 --- a/libsearch/index/construct-document.h +++ b/libsearch/index/construct-document.h @@ -26,7 +26,7 @@ #include "document.h" #include "index-generator.h" -namespace Zeeker { +namespace UkuiSearch { class IndexGenerator; class ConstructDocumentForPath : public QRunnable { diff --git a/libsearch/index/document.cpp b/libsearch/index/document.cpp index ae3abcf..e430d31 100644 --- a/libsearch/index/document.cpp +++ b/libsearch/index/document.cpp @@ -19,7 +19,7 @@ */ #include "document.h" #include -using namespace Zeeker; +using namespace UkuiSearch; void Document::setData(QString &data) { if(data.isEmpty()) return; diff --git a/libsearch/index/document.h b/libsearch/index/document.h index c72c73e..1949bb3 100644 --- a/libsearch/index/document.h +++ b/libsearch/index/document.h @@ -24,7 +24,7 @@ #include #include #include -namespace Zeeker { +namespace UkuiSearch { class Document { public: Document() = default; diff --git a/libsearch/index/file-reader.cpp b/libsearch/index/file-reader.cpp index 4ac13f8..6a05962 100644 --- a/libsearch/index/file-reader.cpp +++ b/libsearch/index/file-reader.cpp @@ -20,7 +20,7 @@ #include "file-reader.h" #include "file-utils.h" #include "binary-parser.h" -using namespace Zeeker; +using namespace UkuiSearch; FileReader::FileReader(QObject *parent) : QObject(parent) { } diff --git a/libsearch/index/file-reader.h b/libsearch/index/file-reader.h index 5f4d937..128d92b 100644 --- a/libsearch/index/file-reader.h +++ b/libsearch/index/file-reader.h @@ -22,7 +22,7 @@ #include #include -namespace Zeeker { +namespace UkuiSearch { class FileReader : public QObject { Q_OBJECT public: diff --git a/libsearch/index/file-search-plugin.cpp b/libsearch/index/file-search-plugin.cpp index a41d530..6371a23 100644 --- a/libsearch/index/file-search-plugin.cpp +++ b/libsearch/index/file-search-plugin.cpp @@ -4,7 +4,7 @@ #include #include #include -using namespace Zeeker; +using namespace UkuiSearch; FileSearchPlugin::FileSearchPlugin(QObject *parent) : QObject(parent) { @@ -32,7 +32,7 @@ QString FileSearchPlugin::getPluginName() return tr("File Search"); } -void Zeeker::FileSearchPlugin::KeywordSearch(QString keyword, DataQueue *searchResult) +void UkuiSearch::FileSearchPlugin::KeywordSearch(QString keyword, DataQueue *searchResult) { SearchManager::m_mutexFile.lock(); ++SearchManager::uniqueSymbolFile; @@ -239,7 +239,7 @@ QString DirSearchPlugin::getPluginName() return tr("Dir Search"); } -void Zeeker::DirSearchPlugin::KeywordSearch(QString keyword, DataQueue *searchResult) +void UkuiSearch::DirSearchPlugin::KeywordSearch(QString keyword, DataQueue *searchResult) { SearchManager::m_mutexDir.lock(); ++SearchManager::uniqueSymbolDir; @@ -419,7 +419,7 @@ QString FileContengSearchPlugin::getPluginName() return tr("File content search"); } -void Zeeker::FileContengSearchPlugin::KeywordSearch(QString keyword, DataQueue *searchResult) +void UkuiSearch::FileContengSearchPlugin::KeywordSearch(QString keyword, DataQueue *searchResult) { SearchManager::m_mutexContent.lock(); ++SearchManager::uniqueSymbolContent; diff --git a/libsearch/index/file-search-plugin.h b/libsearch/index/file-search-plugin.h index 229d13b..ff94c34 100644 --- a/libsearch/index/file-search-plugin.h +++ b/libsearch/index/file-search-plugin.h @@ -14,7 +14,7 @@ #include "search-plugin-iface.h" #include "common.h" #include "action-label.h" -namespace Zeeker { +namespace UkuiSearch { //internal plugin class LIBSEARCH_EXPORT FileSearchPlugin : public QObject, public SearchPluginIface { diff --git a/libsearch/index/first-index.cpp b/libsearch/index/first-index.cpp index fc649eb..a35f9f5 100644 --- a/libsearch/index/first-index.cpp +++ b/libsearch/index/first-index.cpp @@ -24,7 +24,7 @@ #define NEW_QUEUE(a) a = new QQueue(); qDebug("---------------------------%s %s %s new at %d..",__FILE__,__FUNCTION__,#a,__LINE__); //#define DELETE_QUEUE(a ) -using namespace Zeeker; +using namespace UkuiSearch; FirstIndex::FirstIndex() { m_pool.setMaxThreadCount(2); m_pool.setExpiryTimeout(100); diff --git a/libsearch/index/first-index.h b/libsearch/index/first-index.h index 9275260..83b9262 100644 --- a/libsearch/index/first-index.h +++ b/libsearch/index/first-index.h @@ -40,7 +40,7 @@ #include "index-generator.h" #include "file-utils.h" #include "common.h" -namespace Zeeker { +namespace UkuiSearch { class FirstIndex : public QThread, public Traverse_BFS { public: FirstIndex(); diff --git a/libsearch/index/index-generator.cpp b/libsearch/index/index-generator.cpp index 0e601ed..fb93174 100644 --- a/libsearch/index/index-generator.cpp +++ b/libsearch/index/index-generator.cpp @@ -34,14 +34,14 @@ #define INDEX_PATH (QStandardPaths::writableLocation(QStandardPaths::HomeLocation)+"/.config/org.ukui/ukui-search/index_data").toStdString() #define CONTENT_INDEX_PATH (QStandardPaths::writableLocation(QStandardPaths::HomeLocation)+"/.config/org.ukui/ukui-search/content_index_data").toStdString() -using namespace Zeeker; +using namespace UkuiSearch; static IndexGenerator *global_instance = nullptr; QMutex IndexGenerator::m_mutex; -//QVector *Zeeker::g_docListForPath; -//QMutex Zeeker::g_mutexDocListForPath; -//QVector *Zeeker::g_docListForContent; -//QMutex Zeeker::g_mutexDocListForContent; +//QVector *UkuiSearch::g_docListForPath; +//QMutex UkuiSearch::g_mutexDocListForPath; +//QVector *UkuiSearch::g_docListForContent; +//QMutex UkuiSearch::g_mutexDocListForContent; QMutex IndexGenerator::g_mutexDocListForPath; QMutex IndexGenerator::g_mutexDocListForContent; QVector IndexGenerator::g_docListForPath = QVector(); diff --git a/libsearch/index/index-generator.h b/libsearch/index/index-generator.h index 9cd98fe..252af64 100644 --- a/libsearch/index/index-generator.h +++ b/libsearch/index/index-generator.h @@ -36,7 +36,7 @@ #include "common.h" #include "pending-file.h" -namespace Zeeker { +namespace UkuiSearch { //extern QVector *_doc_list_path; //extern QMutex _mutex_doc_list_path; //extern QVector *_doc_list_content; diff --git a/libsearch/index/index-status-recorder.cpp b/libsearch/index/index-status-recorder.cpp index 9089722..2ac7f3c 100644 --- a/libsearch/index/index-status-recorder.cpp +++ b/libsearch/index/index-status-recorder.cpp @@ -1,6 +1,6 @@ #include "index-status-recorder.h" -using namespace Zeeker; +using namespace UkuiSearch; static IndexStatusRecorder *global_instance_indexStatusRecorder = nullptr; IndexStatusRecorder *IndexStatusRecorder::getInstance() diff --git a/libsearch/index/index-status-recorder.h b/libsearch/index/index-status-recorder.h index bf65850..280950f 100644 --- a/libsearch/index/index-status-recorder.h +++ b/libsearch/index/index-status-recorder.h @@ -10,7 +10,7 @@ #define INOTIFY_NORMAL_EXIT "inotify_normal_exit" #define PENDING_FILE_QUEUE_FINISH "pending_file_queue_finish" #define INDEX_STATUS QDir::homePath() + "/.config/org.ukui/ukui-search/ukui-search-index-status.conf" -namespace Zeeker { +namespace UkuiSearch { //fixme: we need a better way to record index status. class IndexStatusRecorder : public QObject { diff --git a/libsearch/index/inotify-watch.cpp b/libsearch/index/inotify-watch.cpp index 88f63fb..e5a49a2 100644 --- a/libsearch/index/inotify-watch.cpp +++ b/libsearch/index/inotify-watch.cpp @@ -2,10 +2,10 @@ #include #include #include -using namespace Zeeker; +using namespace UkuiSearch; static InotifyWatch* global_instance_InotifyWatch = nullptr; -Zeeker::InotifyWatch *Zeeker::InotifyWatch::getInstance(const QString &path) +UkuiSearch::InotifyWatch *UkuiSearch::InotifyWatch::getInstance(const QString &path) { if(!global_instance_InotifyWatch) { global_instance_InotifyWatch = new InotifyWatch(path); @@ -13,7 +13,7 @@ Zeeker::InotifyWatch *Zeeker::InotifyWatch::getInstance(const QString &path) return global_instance_InotifyWatch; } -Zeeker::InotifyWatch::InotifyWatch(const QString &path): Traverse_BFS(path) +UkuiSearch::InotifyWatch::InotifyWatch(const QString &path): Traverse_BFS(path) { qDebug() << "setInotifyMaxUserWatches start"; UkuiSearchQDBus usQDBus; diff --git a/libsearch/index/inotify-watch.h b/libsearch/index/inotify-watch.h index eb21587..b0dd7a4 100644 --- a/libsearch/index/inotify-watch.h +++ b/libsearch/index/inotify-watch.h @@ -15,7 +15,7 @@ #include "first-index.h" #include "pending-file-queue.h" #include "common.h" -namespace Zeeker { +namespace UkuiSearch { class InotifyWatch : public QThread, public Traverse_BFS { Q_OBJECT diff --git a/libsearch/index/pending-file-queue.cpp b/libsearch/index/pending-file-queue.cpp index 47a93c9..27d4067 100644 --- a/libsearch/index/pending-file-queue.cpp +++ b/libsearch/index/pending-file-queue.cpp @@ -20,7 +20,7 @@ #include "pending-file-queue.h" #include "file-utils.h" #include -using namespace Zeeker; +using namespace UkuiSearch; static PendingFileQueue *global_instance_pending_file_queue = nullptr; PendingFileQueue::PendingFileQueue(QObject *parent) : QThread(parent) { diff --git a/libsearch/index/pending-file-queue.h b/libsearch/index/pending-file-queue.h index a42adf7..c9ce399 100644 --- a/libsearch/index/pending-file-queue.h +++ b/libsearch/index/pending-file-queue.h @@ -28,7 +28,7 @@ #include "pending-file.h" #include "index-generator.h" -namespace Zeeker { +namespace UkuiSearch { class PendingFileQueue : public QThread { Q_OBJECT diff --git a/libsearch/index/pending-file.cpp b/libsearch/index/pending-file.cpp index aa30720..4cd5dbc 100644 --- a/libsearch/index/pending-file.cpp +++ b/libsearch/index/pending-file.cpp @@ -18,7 +18,7 @@ * */ #include "pending-file.h" -using namespace Zeeker; +using namespace UkuiSearch; PendingFile::PendingFile(const QString &path) : m_path(path) , m_deleted(false) diff --git a/libsearch/index/pending-file.h b/libsearch/index/pending-file.h index 41555c6..f3a825c 100644 --- a/libsearch/index/pending-file.h +++ b/libsearch/index/pending-file.h @@ -22,7 +22,7 @@ #include #include -namespace Zeeker { +namespace UkuiSearch { /** * Represents a file/folder which needs to be indexed. */ diff --git a/libsearch/index/search-manager.cpp b/libsearch/index/search-manager.cpp index 18af3c4..0c2979c 100644 --- a/libsearch/index/search-manager.cpp +++ b/libsearch/index/search-manager.cpp @@ -18,7 +18,7 @@ * */ #include "search-manager.h" -using namespace Zeeker; +using namespace UkuiSearch; size_t SearchManager::uniqueSymbolFile = 0; size_t SearchManager::uniqueSymbolDir = 0; size_t SearchManager::uniqueSymbolContent = 0; diff --git a/libsearch/index/search-manager.h b/libsearch/index/search-manager.h index 94d8d15..36d5bf2 100644 --- a/libsearch/index/search-manager.h +++ b/libsearch/index/search-manager.h @@ -45,7 +45,7 @@ #define INDEX_PATH (QStandardPaths::writableLocation(QStandardPaths::HomeLocation)+"/.config/org.ukui/ukui-search/index_data").toStdString() #define CONTENT_INDEX_PATH (QStandardPaths::writableLocation(QStandardPaths::HomeLocation)+"/.config/org.ukui/ukui-search/content_index_data").toStdString() -namespace Zeeker { +namespace UkuiSearch { class FileMatchDecider; class FileContentMatchDecider; class LIBSEARCH_EXPORT SearchManager : public QObject { @@ -77,7 +77,7 @@ Q_SIGNALS: void resultContent(QQueue> *); private: static bool isBlocked(QString &path); - static bool creatResultInfo(Zeeker::SearchPluginIface::ResultInfo &ri, QString path); + static bool creatResultInfo(UkuiSearch::SearchPluginIface::ResultInfo &ri, QString path); QThreadPool m_pool; }; diff --git a/libsearch/index/search-method-manager.cpp b/libsearch/index/search-method-manager.cpp index 4e2dec5..c35c0c8 100644 --- a/libsearch/index/search-method-manager.cpp +++ b/libsearch/index/search-method-manager.cpp @@ -1,5 +1,5 @@ #include "search-method-manager.h" -using namespace Zeeker; +using namespace UkuiSearch; static SearchMethodManager* global_instance = nullptr; SearchMethodManager::SearchMethodManager() diff --git a/libsearch/index/search-method-manager.h b/libsearch/index/search-method-manager.h index 157e83e..fbd885d 100644 --- a/libsearch/index/search-method-manager.h +++ b/libsearch/index/search-method-manager.h @@ -4,7 +4,7 @@ #include "first-index.h" //#include "inotify-index.h" #include "inotify-watch.h" -namespace Zeeker { +namespace UkuiSearch { class SearchMethodManager { public: static SearchMethodManager *getInstance(); diff --git a/libsearch/index/traverse_bfs.cpp b/libsearch/index/traverse_bfs.cpp index 97a5f13..e2d35b9 100644 --- a/libsearch/index/traverse_bfs.cpp +++ b/libsearch/index/traverse_bfs.cpp @@ -18,7 +18,7 @@ * */ #include "traverse_bfs.h" -using namespace Zeeker; +using namespace UkuiSearch; Traverse_BFS::Traverse_BFS(const QString& path) { Q_ASSERT('/' == path.at(0)); this->path = path; diff --git a/libsearch/index/traverse_bfs.h b/libsearch/index/traverse_bfs.h index a3388d0..c67d16c 100644 --- a/libsearch/index/traverse_bfs.h +++ b/libsearch/index/traverse_bfs.h @@ -24,7 +24,7 @@ #include #include #include -namespace Zeeker { +namespace UkuiSearch { class Traverse_BFS { public: Traverse_BFS() = default; diff --git a/libsearch/index/ukui-search-qdbus.cpp b/libsearch/index/ukui-search-qdbus.cpp index b39f4da..ecb163d 100644 --- a/libsearch/index/ukui-search-qdbus.cpp +++ b/libsearch/index/ukui-search-qdbus.cpp @@ -19,7 +19,7 @@ */ #include "ukui-search-qdbus.h" #include -using namespace Zeeker; +using namespace UkuiSearch; UkuiSearchQDBus::UkuiSearchQDBus() { this->tmpSystemQDBusInterface = new QDBusInterface("com.ukui.search.qt.systemdbus", "/", diff --git a/libsearch/index/ukui-search-qdbus.h b/libsearch/index/ukui-search-qdbus.h index 898dc53..a258755 100644 --- a/libsearch/index/ukui-search-qdbus.h +++ b/libsearch/index/ukui-search-qdbus.h @@ -22,7 +22,7 @@ #include #include -namespace Zeeker { +namespace UkuiSearch { class UkuiSearchQDBus { public: UkuiSearchQDBus(); diff --git a/libsearch/libsearch.cpp b/libsearch/libsearch.cpp index 54dde69..a0a0ed1 100644 --- a/libsearch/libsearch.cpp +++ b/libsearch/libsearch.cpp @@ -18,6 +18,6 @@ * */ #include "libsearch.h" -using namespace Zeeker; +using namespace UkuiSearch; // Encapsulate advanced interfaces here. diff --git a/libsearch/libsearch.h b/libsearch/libsearch.h index a783473..92eb6f8 100644 --- a/libsearch/libsearch.h +++ b/libsearch/libsearch.h @@ -33,7 +33,7 @@ #include "index/search-manager.h" -namespace Zeeker { +namespace UkuiSearch { //class LIBSEARCH_EXPORT GlobalSearch { //public: diff --git a/libsearch/notesearch/note-search-plugin.cpp b/libsearch/notesearch/note-search-plugin.cpp index 23b1b39..764e7cb 100644 --- a/libsearch/notesearch/note-search-plugin.cpp +++ b/libsearch/notesearch/note-search-plugin.cpp @@ -4,7 +4,7 @@ #include #include "file-utils.h" #include "chinese-segmentation.h" -using namespace Zeeker; +using namespace UkuiSearch; NoteSearchPlugin::NoteSearchPlugin(QObject *parent) { diff --git a/libsearch/notesearch/note-search-plugin.h b/libsearch/notesearch/note-search-plugin.h index addbc1b..07efa18 100644 --- a/libsearch/notesearch/note-search-plugin.h +++ b/libsearch/notesearch/note-search-plugin.h @@ -16,7 +16,7 @@ #include "search-plugin-iface.h" #include "action-label.h" #include "libsearch_global.h" -namespace Zeeker { +namespace UkuiSearch { static size_t g_uniqueSymbol; static QMutex g_mutex; diff --git a/libsearch/plugininterface/action-label.cpp b/libsearch/plugininterface/action-label.cpp index 5cbbbff..6af869a 100644 --- a/libsearch/plugininterface/action-label.cpp +++ b/libsearch/plugininterface/action-label.cpp @@ -21,7 +21,7 @@ #define ACTION_NORMAL_COLOR QColor(55, 144, 250, 255) #define ACTION_HOVER_COLOR QColor(64, 169, 251, 255) #define ACTION_PRESS_COLOR QColor(41, 108, 217, 255) -using namespace Zeeker; +using namespace UkuiSearch; ActionLabel::ActionLabel(const QString &action, const QString &key, QWidget *parent) : QLabel(parent) { m_action = action; diff --git a/libsearch/plugininterface/action-label.h b/libsearch/plugininterface/action-label.h index 11ec07c..b1f910e 100644 --- a/libsearch/plugininterface/action-label.h +++ b/libsearch/plugininterface/action-label.h @@ -23,7 +23,7 @@ #include #include #include -namespace Zeeker { +namespace UkuiSearch { class ActionLabel : public QLabel { Q_OBJECT diff --git a/libsearch/plugininterface/data-queue.h b/libsearch/plugininterface/data-queue.h index 6c08d0b..8e08a97 100644 --- a/libsearch/plugininterface/data-queue.h +++ b/libsearch/plugininterface/data-queue.h @@ -4,7 +4,7 @@ #include #include #include "libsearch_global.h" -namespace Zeeker { +namespace UkuiSearch { // TODO I want a unlocked queue template class LIBSEARCH_EXPORT DataQueue : public QList diff --git a/libsearch/plugininterface/plugin-iface.h b/libsearch/plugininterface/plugin-iface.h index cf4a2c7..5159204 100644 --- a/libsearch/plugininterface/plugin-iface.h +++ b/libsearch/plugininterface/plugin-iface.h @@ -1,7 +1,7 @@ #ifndef PLUGININTERFACE_H #define PLUGININTERFACE_H -namespace Zeeker { +namespace UkuiSearch { class PluginInterface { diff --git a/libsearch/plugininterface/search-plugin-iface.h b/libsearch/plugininterface/search-plugin-iface.h index 3363407..0ca9315 100644 --- a/libsearch/plugininterface/search-plugin-iface.h +++ b/libsearch/plugininterface/search-plugin-iface.h @@ -10,7 +10,7 @@ #include "plugin-iface.h" #include "data-queue.h" -namespace Zeeker { +namespace UkuiSearch { class SearchPluginIface : public PluginInterface { public: @@ -47,6 +47,6 @@ public: }; } -Q_DECLARE_INTERFACE(Zeeker::SearchPluginIface, SearchPluginIface_iid) +Q_DECLARE_INTERFACE(UkuiSearch::SearchPluginIface, SearchPluginIface_iid) #endif // SEARCHPLUGINIFACE_H diff --git a/libsearch/pluginmanage/plugin-manager.cpp b/libsearch/pluginmanage/plugin-manager.cpp index 6fbb124..49af767 100644 --- a/libsearch/pluginmanage/plugin-manager.cpp +++ b/libsearch/pluginmanage/plugin-manager.cpp @@ -1,7 +1,7 @@ #include "plugin-manager.h" #include "search-plugin-manager.h" -using namespace Zeeker; +using namespace UkuiSearch; static PluginManager *global_instance = nullptr; void PluginManager::init() diff --git a/libsearch/pluginmanage/plugin-manager.h b/libsearch/pluginmanage/plugin-manager.h index 567647b..685edfe 100644 --- a/libsearch/pluginmanage/plugin-manager.h +++ b/libsearch/pluginmanage/plugin-manager.h @@ -10,7 +10,7 @@ #include "plugininterface/plugin-iface.h" #include "plugininterface/search-plugin-iface.h" -namespace Zeeker { +namespace UkuiSearch { class LIBSEARCH_EXPORT PluginManager : public QObject { Q_OBJECT diff --git a/libsearch/pluginmanage/search-plugin-manager.cpp b/libsearch/pluginmanage/search-plugin-manager.cpp index aed7e31..720fcc0 100644 --- a/libsearch/pluginmanage/search-plugin-manager.cpp +++ b/libsearch/pluginmanage/search-plugin-manager.cpp @@ -6,7 +6,7 @@ #include "note-search-plugin.h" #include "web-search-plugin.h" -using namespace Zeeker; +using namespace UkuiSearch; static SearchPluginManager *global_instance = nullptr; SearchPluginManager::SearchPluginManager(QObject *parent) @@ -20,7 +20,7 @@ SearchPluginManager::SearchPluginManager(QObject *parent) registerPlugin(new WebSearchPlugin(this)); } -bool SearchPluginManager::registerPlugin(Zeeker::SearchPluginIface *plugin) +bool SearchPluginManager::registerPlugin(UkuiSearch::SearchPluginIface *plugin) { if (m_map.end() != m_map.find(plugin->name())){ return false; diff --git a/libsearch/pluginmanage/search-plugin-manager.h b/libsearch/pluginmanage/search-plugin-manager.h index 0d595f9..be13018 100644 --- a/libsearch/pluginmanage/search-plugin-manager.h +++ b/libsearch/pluginmanage/search-plugin-manager.h @@ -4,7 +4,7 @@ #include #include "search-plugin-iface.h" -namespace Zeeker { +namespace UkuiSearch { class SearchPluginManager : public QObject { diff --git a/libsearch/settingsearch/settings-search-plugin.cpp b/libsearch/settingsearch/settings-search-plugin.cpp index 1f61ecc..00d9277 100644 --- a/libsearch/settingsearch/settings-search-plugin.cpp +++ b/libsearch/settingsearch/settings-search-plugin.cpp @@ -5,7 +5,7 @@ #include "settings-search-plugin.h" #include "file-utils.h" -using namespace Zeeker; +using namespace UkuiSearch; static SettingsMatch * settingMatchClass = nullptr; size_t SettingsSearchPlugin::m_uniqueSymbolForSettings = 0; QMutex SettingsSearchPlugin::m_mutex; @@ -35,7 +35,7 @@ QString SettingsSearchPlugin::getPluginName() return tr("Settings Search"); } -void Zeeker::SettingsSearchPlugin::KeywordSearch(QString keyword, DataQueue *searchResult) +void UkuiSearch::SettingsSearchPlugin::KeywordSearch(QString keyword, DataQueue *searchResult) { m_mutex.lock(); ++m_uniqueSymbolForSettings; diff --git a/libsearch/settingsearch/settings-search-plugin.h b/libsearch/settingsearch/settings-search-plugin.h index 01bb5f6..de68002 100644 --- a/libsearch/settingsearch/settings-search-plugin.h +++ b/libsearch/settingsearch/settings-search-plugin.h @@ -13,7 +13,7 @@ #include "action-label.h" #include "search-plugin-iface.h" -namespace Zeeker { +namespace UkuiSearch { class LIBSEARCH_EXPORT SettingsSearchPlugin : public QObject, public SearchPluginIface { Q_OBJECT diff --git a/libsearch/websearch/web-search-plugin.cpp b/libsearch/websearch/web-search-plugin.cpp index d3804f8..269170a 100644 --- a/libsearch/websearch/web-search-plugin.cpp +++ b/libsearch/websearch/web-search-plugin.cpp @@ -1,7 +1,7 @@ #include "web-search-plugin.h" #include "global-settings.h" -using namespace Zeeker; +using namespace UkuiSearch; WebSearchPlugin::WebSearchPlugin(QObject *parent) : QObject(parent) { SearchPluginIface::Actioninfo open { 0, tr("Start browser search")}; @@ -9,22 +9,22 @@ WebSearchPlugin::WebSearchPlugin(QObject *parent) : QObject(parent) initDetailPage(); } -const QString Zeeker::WebSearchPlugin::name() +const QString UkuiSearch::WebSearchPlugin::name() { return "Web Page"; } -const QString Zeeker::WebSearchPlugin::description() +const QString UkuiSearch::WebSearchPlugin::description() { return tr("Web Page"); } -QString Zeeker::WebSearchPlugin::getPluginName() +QString UkuiSearch::WebSearchPlugin::getPluginName() { return tr("Web Page"); } -void Zeeker::WebSearchPlugin::KeywordSearch(QString keyword, DataQueue *searchResult) +void UkuiSearch::WebSearchPlugin::KeywordSearch(QString keyword, DataQueue *searchResult) { m_keyWord = keyword; ResultInfo resultInfo; @@ -35,12 +35,12 @@ void Zeeker::WebSearchPlugin::KeywordSearch(QString keyword, DataQueueenqueue(resultInfo); } -QList Zeeker::WebSearchPlugin::getActioninfo(int type) +QList UkuiSearch::WebSearchPlugin::getActioninfo(int type) { return m_actionInfo; } -void Zeeker::WebSearchPlugin::openAction(int actionkey, QString key, int type) +void UkuiSearch::WebSearchPlugin::openAction(int actionkey, QString key, int type) { QString address; QString engine = GlobalSettings::getInstance()->getValue("web_engine").toString(); @@ -58,12 +58,12 @@ void Zeeker::WebSearchPlugin::openAction(int actionkey, QString key, int type) QDesktopServices::openUrl(address); } -QWidget *Zeeker::WebSearchPlugin::detailPage(const Zeeker::SearchPluginIface::ResultInfo &ri) +QWidget *UkuiSearch::WebSearchPlugin::detailPage(const UkuiSearch::SearchPluginIface::ResultInfo &ri) { return m_detailPage; } -void Zeeker::WebSearchPlugin::initDetailPage() +void UkuiSearch::WebSearchPlugin::initDetailPage() { m_detailPage = new QWidget(); m_detailPage->setFixedWidth(360); diff --git a/libsearch/websearch/web-search-plugin.h b/libsearch/websearch/web-search-plugin.h index 4f7bc87..28107c8 100644 --- a/libsearch/websearch/web-search-plugin.h +++ b/libsearch/websearch/web-search-plugin.h @@ -13,7 +13,7 @@ #include "action-label.h" #include "search-plugin-iface.h" -namespace Zeeker { +namespace UkuiSearch { class LIBSEARCH_EXPORT WebSearchPlugin : public QObject, public SearchPluginIface { Q_OBJECT diff --git a/translations/libukui-search/libukui-search_zh_CN.ts b/translations/libukui-search/libukui-search_zh_CN.ts index 012f661..03678bc 100644 --- a/translations/libukui-search/libukui-search_zh_CN.ts +++ b/translations/libukui-search/libukui-search_zh_CN.ts @@ -2,7 +2,7 @@ - Zeeker::AppMatch + UkuiSearch::AppMatch Application Description: @@ -10,14 +10,14 @@ - Zeeker::AppSearch + UkuiSearch::AppSearch Application Description: 应用描述： - Zeeker::AppSearchPlugin + UkuiSearch::AppSearchPlugin @@ -59,7 +59,7 @@ - Zeeker::DirSearchPlugin + UkuiSearch::DirSearchPlugin @@ -109,7 +109,7 @@ - Zeeker::FileContengSearchPlugin + UkuiSearch::FileContengSearchPlugin @@ -163,7 +163,7 @@ - Zeeker::FileSearchPlugin + UkuiSearch::FileSearchPlugin @@ -225,7 +225,7 @@ - Zeeker::NoteSearch + UkuiSearch::NoteSearch Note Description: @@ -234,7 +234,7 @@ - Zeeker::NoteSearchPlugin + UkuiSearch::NoteSearchPlugin @@ -263,7 +263,7 @@ - Zeeker::SearchManager + UkuiSearch::SearchManager Path: @@ -276,7 +276,7 @@ - Zeeker::SettingsSearchPlugin + UkuiSearch::SettingsSearchPlugin @@ -300,7 +300,7 @@ - Zeeker::WebSearchPlugin + UkuiSearch::WebSearchPlugin diff --git a/translations/ukui-search/bo.ts b/translations/ukui-search/bo.ts index 2546e0a..d43d482 100644 --- a/translations/ukui-search/bo.ts +++ b/translations/ukui-search/bo.ts @@ -10,7 +10,7 @@ - Zeeker::BestListWidget + UkuiSearch::BestListWidget Best Matches @@ -18,7 +18,7 @@ - Zeeker::CreateIndexAskDialog + UkuiSearch::CreateIndexAskDialog ukui-search @@ -51,7 +51,7 @@ - Zeeker::FolderListItem + UkuiSearch::FolderListItem Delete the folder out of blacklist @@ -59,7 +59,7 @@ - Zeeker::MainWindow + UkuiSearch::MainWindow ukui-search @@ -72,7 +72,7 @@ - Zeeker::SearchLineEdit + UkuiSearch::SearchLineEdit Search @@ -80,7 +80,7 @@ - Zeeker::SettingsWidget + UkuiSearch::SettingsWidget ukui-search-settings @@ -241,7 +241,7 @@ - Zeeker::WebSearchWidget + UkuiSearch::WebSearchWidget Web Page diff --git a/translations/ukui-search/tr.ts b/translations/ukui-search/tr.ts index 8b1b29f..965a126 100644 --- a/translations/ukui-search/tr.ts +++ b/translations/ukui-search/tr.ts @@ -245,7 +245,7 @@ - Zeeker::BestListWidget + UkuiSearch::BestListWidget Best Matches @@ -253,7 +253,7 @@ - Zeeker::ContentWidget + UkuiSearch::ContentWidget Recently Opened Yeni Açılan @@ -296,7 +296,7 @@ - Zeeker::CreateIndexAskDialog + UkuiSearch::CreateIndexAskDialog ukui-search @@ -329,7 +329,7 @@ - Zeeker::FolderListItem + UkuiSearch::FolderListItem Delete the folder out of blacklist @@ -337,7 +337,7 @@ - Zeeker::HomePage + UkuiSearch::HomePage Open Quickly Hızlı Aç @@ -352,7 +352,7 @@ - Zeeker::MainWindow + UkuiSearch::MainWindow ukui-search @@ -369,7 +369,7 @@ - Zeeker::OptionView + UkuiSearch::OptionView Open Aç @@ -392,14 +392,14 @@ - Zeeker::SearchBarHLayout + UkuiSearch::SearchBarHLayout Search Ara - Zeeker::SearchDetailView + UkuiSearch::SearchDetailView Application Uygulama @@ -418,7 +418,7 @@ - Zeeker::SearchLineEdit + UkuiSearch::SearchLineEdit Search @@ -426,7 +426,7 @@ - Zeeker::SettingsWidget + UkuiSearch::SettingsWidget ukui-search-settings @@ -587,7 +587,7 @@ - Zeeker::ShowMoreLabel + UkuiSearch::ShowMoreLabel Show More... Daha Fazla Göster... @@ -614,7 +614,7 @@ - Zeeker::WebSearchWidget + UkuiSearch::WebSearchWidget Web Page diff --git a/translations/ukui-search/zh_CN.ts b/translations/ukui-search/zh_CN.ts index 0633143..4a0cd4b 100644 --- a/translations/ukui-search/zh_CN.ts +++ b/translations/ukui-search/zh_CN.ts @@ -10,7 +10,7 @@ - Zeeker::BestListWidget + UkuiSearch::BestListWidget Best Matches @@ -18,7 +18,7 @@ - Zeeker::ContentWidget + UkuiSearch::ContentWidget Recently Opened 最近 @@ -65,7 +65,7 @@ - Zeeker::CreateIndexAskDialog + UkuiSearch::CreateIndexAskDialog ukui-search @@ -98,7 +98,7 @@ - Zeeker::FolderListItem + UkuiSearch::FolderListItem Delete the folder out of blacklist @@ -106,7 +106,7 @@ - Zeeker::HomePage + UkuiSearch::HomePage Open Quickly 快速入口 @@ -121,7 +121,7 @@ - Zeeker::MainWindow + UkuiSearch::MainWindow ukui-search @@ -138,7 +138,7 @@ - Zeeker::OptionView + UkuiSearch::OptionView Open 打开 @@ -165,14 +165,14 @@ - Zeeker::SearchBarHLayout + UkuiSearch::SearchBarHLayout Search 搜索 - Zeeker::SearchDetailView + UkuiSearch::SearchDetailView Introduction: %1 软件介绍: %1 @@ -199,7 +199,7 @@ - Zeeker::SearchLineEdit + UkuiSearch::SearchLineEdit Search @@ -207,7 +207,7 @@ - Zeeker::SettingsWidget + UkuiSearch::SettingsWidget ukui-search-settings @@ -368,7 +368,7 @@ - Zeeker::ShowMoreLabel + UkuiSearch::ShowMoreLabel Show More... 显示更多... @@ -395,7 +395,7 @@ - Zeeker::WebSearchWidget + UkuiSearch::WebSearchWidget Web Page diff --git a/ukui-search-service/main.cpp b/ukui-search-service/main.cpp index b1fe9c7..7daf387 100644 --- a/ukui-search-service/main.cpp +++ b/ukui-search-service/main.cpp @@ -7,7 +7,7 @@ #include #include #include "ukui-search-service.h" -using namespace Zeeker; +using namespace UkuiSearch; void messageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) { QByteArray localMsg = msg.toLocal8Bit(); diff --git a/ukui-search-service/ukui-search-service.cpp b/ukui-search-service/ukui-search-service.cpp index acda486..b8f99b9 100644 --- a/ukui-search-service/ukui-search-service.cpp +++ b/ukui-search-service/ukui-search-service.cpp @@ -2,7 +2,7 @@ #include "ukui-search-service.h" #define UKUI_SEARCH_SCHEMAS "org.ukui.search.settings" #define SEARCH_METHOD_KEY "indexSearch" -using namespace Zeeker; +using namespace UkuiSearch; UkuiSearchService::UkuiSearchService(int &argc, char *argv[], const QString &applicationName): QtSingleApplication (applicationName, argc, argv) { qDebug()<<"ukui search service constructor start"; diff --git a/ukui-search-service/ukui-search-service.h b/ukui-search-service/ukui-search-service.h index 320dd88..0de8db6 100644 --- a/ukui-search-service/ukui-search-service.h +++ b/ukui-search-service/ukui-search-service.h @@ -8,7 +8,7 @@ #include "search-method-manager.h" #include "common.h" #include "file-utils.h" -namespace Zeeker { +namespace UkuiSearch { class UkuiSearchService : public QtSingleApplication {