Commit f8416ffe authored by Weng Xuetian's avatar Weng Xuetian

Use the correct dependency. (#12)

Also remove the usage KLineEdit and KComboBox with their Q version since
we didn't use any advanced feature.
parent 877af36e
......@@ -15,7 +15,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets X
find_package(KF5 REQUIRED COMPONENTS
CoreAddons
WidgetsAddons
KCMUtils
ConfigWidgets
ItemViews
I18n
KIO
......@@ -77,14 +77,12 @@ include_directories(
${FCITX4_FCITX_INCLUDE_DIRS}
${FCITX4_FCITX_UTILS_INCLUDE_DIRS}
${FCITX4_FCITX_CONFIG_INCLUDE_DIRS}
${FCITX_QT_INCLUDE_DIRS}
)
link_directories(
${FCITX4_FCITX_LIBRARY_DIRS}
${FCITX4_FCITX_UTILS_LIBRARY_DIRS}
${FCITX4_FCITX_CONFIG_LIBRARY_DIRS}
${FCITX_QT_LIBRARY_DIRS}
)
add_subdirectory(po)
......
......@@ -35,7 +35,7 @@ target_link_libraries(kcm_fcitx
Qt5::X11Extras
KF5::CoreAddons
KF5::WidgetsAddons
KF5::KCMUtils
KF5::ConfigWidgets
KF5::ItemViews
KF5::I18n
KF5::KIOCore
......
......@@ -39,8 +39,6 @@ class KCategoryDrawer;
class KCategorizedView;
class KLineEdit;
class QPushButton;
class QCheckBox;
......
......@@ -4,7 +4,7 @@
#include <QComboBox>
#include <QLabel>
#include <QX11Info>
#include <KComboBox>
#include <QComboBox>
#include <KLocalizedString>
#include <fcitxqtkeyboardproxy.h>
......@@ -31,7 +31,7 @@ Fcitx::IMConfigDialog::IMConfigDialog(const QString& imName, const FcitxAddon* a
if (!layoutList.isError()) {
m_layoutList = layoutList.value();
m_layoutCombobox = new KComboBox(this);
m_layoutCombobox = new QComboBox(this);
QDBusPendingReply< QString, QString > res = Global::instance()->keyboardProxy()->GetLayoutForIM(imName);
res.waitForFinished();
......
......@@ -26,7 +26,7 @@
#include <fcitxqtkeyboardproxy.h>
class KeyboardLayoutWidget;
class KComboBox;
class QComboBox;
namespace Fcitx {
class ConfigWidget;
......@@ -42,7 +42,7 @@ private slots:
private:
QString m_imName;
KComboBox* m_layoutCombobox;
QComboBox* m_layoutCombobox;
ConfigWidget* m_configPage;
FcitxQtKeyboardLayoutList m_layoutList;
KeyboardLayoutWidget* m_layoutWidget;
......
......@@ -7,7 +7,7 @@
#include <QVBoxLayout>
#include <QLabel>
#include <KLocalizedString>
#include <KLineEdit>
#include <QLineEdit>
#include <fcitxqtinputmethodproxy.h>
Fcitx::UIPage::UIPage(Fcitx::Module* parent) : QWidget(parent)
......@@ -53,7 +53,7 @@ void Fcitx::UIPage::getUIFinished(QDBusPendingCallWatcher* watcher)
break;
// this should not happen, but ,we just protect it
KLineEdit* lineEdit = static_cast<KLineEdit*>(option->filterArg);
QLineEdit* lineEdit = static_cast<QLineEdit*>(option->filterArg);
if (!lineEdit)
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment