From c71ba8e51c54e52aa95f401d78dd8be54e828a75 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 25 Sep 2018 22:28:57 +0900 Subject: Add includes to UI files to resolve FTBFS. Signed-off-by: Michele Calgaro (cherry picked from commit 59340c8595cf02dc0c604860c09e6408640d43de) --- k3bsetup/base_k3bsetup2.ui | 10 ++++------ .../external/base_k3bexternalencoderconfigwidget.ui | 6 +++--- .../external/base_k3bexternalencodereditwidget.ui | 10 ++++------ .../encoder/lame/base_k3blameencodersettingswidget.ui | 6 +++--- .../lame/base_k3bmanualbitratesettingswidget.ui | 3 +++ .../ogg/base_k3boggvorbisencodersettingswidget.ui | 8 +++----- src/option/base_k3bcddboptiontab.ui | 10 +++++----- src/option/base_k3bmiscoptiontab.ui | 12 +++++------- src/option/base_k3bpluginoptiontab.ui | 6 +++--- src/option/base_k3bthemeoptiontab.ui | 6 +++--- src/projects/base_k3badvanceddataimagesettings.ui | 9 ++++----- src/projects/base_k3baudiocdtextallfieldswidget.ui | 13 +++---------- src/projects/base_k3baudiocdtextwidget.ui | 7 +++---- src/projects/base_k3baudiotrackwidget.ui | 14 ++++---------- src/projects/base_k3bbootimageview.ui | 6 +++--- src/projects/base_k3bmovixoptionswidget.ui | 10 +++------- src/rip/base_k3baudiorippingoptionwidget.ui | 8 ++++---- src/rip/base_k3bcddbpatternwidget.ui | 9 +++++---- src/rip/videodvd/base_k3bvideodvdrippingwidget.ui | 19 ++++++++----------- 19 files changed, 73 insertions(+), 99 deletions(-) diff --git a/k3bsetup/base_k3bsetup2.ui b/k3bsetup/base_k3bsetup2.ui index 9ad2b87..0764b25 100644 --- a/k3bsetup/base_k3bsetup2.ui +++ b/k3bsetup/base_k3bsetup2.ui @@ -371,10 +371,8 @@ - - tdelistview.h - tdelistview.h - keditlistbox.h - klineedit.h - + + keditlistbox.h + tdelistview.h + diff --git a/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui b/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui index 1f61071..7d731b4 100644 --- a/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui +++ b/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui @@ -142,7 +142,7 @@ - - kactivelabel.h - + + kactivelabel.h + diff --git a/plugins/encoder/external/base_k3bexternalencodereditwidget.ui b/plugins/encoder/external/base_k3bexternalencodereditwidget.ui index 415147a..781c95f 100644 --- a/plugins/encoder/external/base_k3bexternalencodereditwidget.ui +++ b/plugins/encoder/external/base_k3bexternalencodereditwidget.ui @@ -155,10 +155,8 @@ Please insert the command used to encode the audio data. The command has to read m_editCommand - - klineedit.h - klineedit.h - kactivelabel.h - klineedit.h - + + kactivelabel.h + klineedit.h + diff --git a/plugins/encoder/lame/base_k3blameencodersettingswidget.ui b/plugins/encoder/lame/base_k3blameencodersettingswidget.ui index a874760..7348e18 100644 --- a/plugins/encoder/lame/base_k3blameencodersettingswidget.ui +++ b/plugins/encoder/lame/base_k3blameencodersettingswidget.ui @@ -474,7 +474,7 @@ This results in many wasted bits for high bitrate encodings but will ensure - - knuminput.h - + + knuminput.h + diff --git a/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui b/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui index 9df1c17..47b9d84 100644 --- a/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui +++ b/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui @@ -270,4 +270,7 @@ The input will be encoded as a mono signal. If it was a stereo signal, it will b + + kcombobox.h + diff --git a/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui b/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui index a76c3c5..5e3e5dc 100644 --- a/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui +++ b/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui @@ -384,9 +384,7 @@ - - knuminput.h - knuminput.h - knuminput.h - + + knuminput.h + diff --git a/src/option/base_k3bcddboptiontab.ui b/src/option/base_k3bcddboptiontab.ui index 0c15130..23a6398 100644 --- a/src/option/base_k3bcddboptiontab.ui +++ b/src/option/base_k3bcddboptiontab.ui @@ -552,9 +552,9 @@ m_editManualCgiPath - - tdelistview.h - tdelistview.h - knuminput.h - + + klineedit.h + knuminput.h + tdelistview.h + diff --git a/src/option/base_k3bmiscoptiontab.ui b/src/option/base_k3bmiscoptiontab.ui index 89a20cf..dc207b1 100644 --- a/src/option/base_k3bmiscoptiontab.ui +++ b/src/option/base_k3bmiscoptiontab.ui @@ -274,11 +274,9 @@ - - kurlrequester.h - klineedit.h - kpushbutton.h - kcombobox.h - k3bintmapcombobox.h - + + k3bintmapcombobox.h + kcombobox.h + kurlrequester.h + diff --git a/src/option/base_k3bpluginoptiontab.ui b/src/option/base_k3bpluginoptiontab.ui index 1278f80..64cbfdd 100644 --- a/src/option/base_k3bpluginoptiontab.ui +++ b/src/option/base_k3bpluginoptiontab.ui @@ -84,7 +84,7 @@ - - k3blistview.h - + + k3blistview.h + diff --git a/src/option/base_k3bthemeoptiontab.ui b/src/option/base_k3bthemeoptiontab.ui index f1eab04..83fda44 100644 --- a/src/option/base_k3bthemeoptiontab.ui +++ b/src/option/base_k3bthemeoptiontab.ui @@ -202,7 +202,7 @@ - - tdelistview.h - + + tdelistview.h + diff --git a/src/projects/base_k3badvanceddataimagesettings.ui b/src/projects/base_k3badvanceddataimagesettings.ui index 0bfefa5..7efbe42 100644 --- a/src/projects/base_k3badvanceddataimagesettings.ui +++ b/src/projects/base_k3badvanceddataimagesettings.ui @@ -185,9 +185,8 @@ m_checkJoliet - - tdelistview.h - kcombobox.h - klineedit.h - + + kcombobox.h + tdelistview.h + diff --git a/src/projects/base_k3baudiocdtextallfieldswidget.ui b/src/projects/base_k3baudiocdtextallfieldswidget.ui index c0e2556..7a84853 100644 --- a/src/projects/base_k3baudiocdtextallfieldswidget.ui +++ b/src/projects/base_k3baudiocdtextallfieldswidget.ui @@ -262,14 +262,7 @@ - - klineedit.h - klineedit.h - klineedit.h - klineedit.h - klineedit.h - klineedit.h - klineedit.h - klineedit.h - + + klineedit.h + diff --git a/src/projects/base_k3baudiocdtextwidget.ui b/src/projects/base_k3baudiocdtextwidget.ui index 4010416..b0870b8 100644 --- a/src/projects/base_k3baudiocdtextwidget.ui +++ b/src/projects/base_k3baudiocdtextwidget.ui @@ -215,8 +215,7 @@ slotCopySongwriter() - - klineedit.h - klineedit.h - + + klineedit.h + diff --git a/src/projects/base_k3baudiotrackwidget.ui b/src/projects/base_k3baudiotrackwidget.ui index ce969da..f944926 100644 --- a/src/projects/base_k3baudiotrackwidget.ui +++ b/src/projects/base_k3baudiotrackwidget.ui @@ -323,14 +323,8 @@ This does not mean that K3b adds an additional gap of silence to the track. This m_checkCopyPermitted - - klineedit.h - klineedit.h - klineedit.h - klineedit.h - klineedit.h - klineedit.h - klineedit.h - k3bmsfedit.h - + + k3bmsfedit.h + klineedit.h + diff --git a/src/projects/base_k3bbootimageview.ui b/src/projects/base_k3bbootimageview.ui index f0e5f27..3811f86 100644 --- a/src/projects/base_k3bbootimageview.ui +++ b/src/projects/base_k3bbootimageview.ui @@ -388,7 +388,7 @@ slotOptionsChanged() - - tdelistview.h - + + tdelistview.h + diff --git a/src/projects/base_k3bmovixoptionswidget.ui b/src/projects/base_k3bmovixoptionswidget.ui index 293ca92..1e6cc09 100644 --- a/src/projects/base_k3bmovixoptionswidget.ui +++ b/src/projects/base_k3bmovixoptionswidget.ui @@ -327,11 +327,7 @@ - - kcombobox.h - kcombobox.h - kcombobox.h - kcombobox.h - kcombobox.h - + + kcombobox.h + diff --git a/src/rip/base_k3baudiorippingoptionwidget.ui b/src/rip/base_k3baudiorippingoptionwidget.ui index 66d34ea..86be04b 100644 --- a/src/rip/base_k3baudiorippingoptionwidget.ui +++ b/src/rip/base_k3baudiorippingoptionwidget.ui @@ -275,8 +275,8 @@ file will contain all tracks one after the other. - - kurlrequester.h - kpushbutton.h - + + kcombobox.h + kurlrequester.h + diff --git a/src/rip/base_k3bcddbpatternwidget.ui b/src/rip/base_k3bcddbpatternwidget.ui index 09d8062..ed12ed5 100644 --- a/src/rip/base_k3bcddbpatternwidget.ui +++ b/src/rip/base_k3bcddbpatternwidget.ui @@ -173,8 +173,9 @@ m_editBlankReplace - - kurllabel.h - kurllabel.h - + + kcombobox.h + klineedit.h + kurllabel.h + diff --git a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui index c4bc79b..e6c35c0 100644 --- a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui +++ b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui @@ -707,15 +707,12 @@ - - tdelistview.h - kurlrequester.h - klineedit.h - kpushbutton.h - kactivelabel.h - k3bintmapcombobox.h - k3bintmapcombobox.h - kurllabel.h - klineedit.h - + + k3bintmapcombobox.h + kactivelabel.h + klineedit.h + kurllabel.h + kurlrequester.h + tdelistview.h + -- cgit v1.2.3