diff --git a/amarok/src/Options1.ui b/amarok/src/Options1.ui index ca3f8597..0608eaf4 100644 --- a/amarok/src/Options1.ui +++ b/amarok/src/Options1.ui @@ -684,6 +684,9 @@ Options1.ui.h + kcombobox.h + klineedit.h + kactivelabel.h slotUpdateMoodFrame() @@ -692,9 +695,4 @@ init() - - kcombobox.h - klineedit.h - kactivelabel.h - diff --git a/amarok/src/Options2.ui b/amarok/src/Options2.ui index 94d80460..281e82f3 100644 --- a/amarok/src/Options2.ui +++ b/amarok/src/Options2.ui @@ -744,6 +744,9 @@ Options2.ui.h + tdefontrequester.h + kcolorbutton.h + kcombobox.h installPushButton_clicked() @@ -756,13 +759,4 @@ init() - - tdefontrequester.h - tdefontrequester.h - tdefontrequester.h - kcolorbutton.h - kcolorbutton.h - kcolorbutton.h - kcombobox.h - diff --git a/amarok/src/Options5.ui b/amarok/src/Options5.ui index 0f068752..077b8d43 100644 --- a/amarok/src/Options5.ui +++ b/amarok/src/Options5.ui @@ -506,6 +506,11 @@ tqapplication.h tqdesktopwidget.h + ktextedit.h + kcombobox.h + knuminput.h + tdefontrequester.h + kcolorbutton.h osd.h @@ -525,7 +530,4 @@ showEvent( TQShowEvent * ) - - ktextedit.h - diff --git a/amarok/src/Options7.ui b/amarok/src/Options7.ui index 8b6fffe0..2bc18c49 100644 --- a/amarok/src/Options7.ui +++ b/amarok/src/Options7.ui @@ -74,8 +74,8 @@ - - klineedit.h - kpushbutton.h - + + klineedit.h + kpushbutton.h + diff --git a/amarok/src/Options8.ui b/amarok/src/Options8.ui index 7ae99160..124f7f36 100644 --- a/amarok/src/Options8.ui +++ b/amarok/src/Options8.ui @@ -290,16 +290,11 @@ Options8.ui.h + kactivelabel.h + klineedit.h updateServices( const TQString & s ) - - kactivelabel.h - kactivelabel.h - klineedit.h - klineedit.h - kactivelabel.h - diff --git a/amarok/src/dbsetup.ui b/amarok/src/dbsetup.ui index f8186c08..2339a086 100644 --- a/amarok/src/dbsetup.ui +++ b/amarok/src/dbsetup.ui @@ -448,6 +448,9 @@ config.h debug.h dbsetup.ui.h + knuminput.h + klineedit.h + kcombobox.h databaseEngine_activated( int ) @@ -456,13 +459,4 @@ init() - - knuminput.h - klineedit.h - klineedit.h - klineedit.h - klineedit.h - klineedit.h - kcombobox.h - diff --git a/amarok/src/deletedialogbase.ui b/amarok/src/deletedialogbase.ui index 5a21c0b5..f3706f97 100644 --- a/amarok/src/deletedialogbase.ui +++ b/amarok/src/deletedialogbase.ui @@ -129,7 +129,7 @@ slotShouldDelete(bool) - - tdelistbox.h - + + tdelistbox.h + diff --git a/amarok/src/engine/xine/xineconfigbase.ui b/amarok/src/engine/xine/xineconfigbase.ui index 50e87bbf..a62fb86b 100644 --- a/amarok/src/engine/xine/xineconfigbase.ui +++ b/amarok/src/engine/xine/xineconfigbase.ui @@ -501,6 +501,8 @@ plugin/pluginconfig.h + kcombobox.h + knuminput.h diff --git a/amarok/src/firstrunwizard.ui b/amarok/src/firstrunwizard.ui index b112c078..c6613fa6 100644 --- a/amarok/src/firstrunwizard.ui +++ b/amarok/src/firstrunwizard.ui @@ -291,12 +291,8 @@ interface() - - kactivelabel.h - kactivelabel.h - kactivelabel.h - kactivelabel.h - dbsetup.h - kactivelabel.h - + + kactivelabel.h + dbsetup.h + diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui b/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui index 4e1b02c2..6d7499f8 100644 --- a/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui +++ b/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui @@ -112,9 +112,9 @@ downloadButtonClicked() - - kurlrequester.h - klineedit.h - kpushbutton.h - + + kurlrequester.h + klineedit.h + kpushbutton.h + diff --git a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui index a58a0dda..26a2062d 100644 --- a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui +++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui @@ -103,7 +103,7 @@ selectionChanged() - - tdelistview.h - + + tdelistview.h + diff --git a/amarok/src/mediadevice/daap/addhostbase.ui b/amarok/src/mediadevice/daap/addhostbase.ui index 3df6bb40..ac17a494 100644 --- a/amarok/src/mediadevice/daap/addhostbase.ui +++ b/amarok/src/mediadevice/daap/addhostbase.ui @@ -171,10 +171,9 @@ - - kactivelabel.h - klineedit.h - knuminput.h - knuminput.h - + + kactivelabel.h + klineedit.h + knuminput.h + diff --git a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui index e3468e17..f0bddeac 100644 --- a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui +++ b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui @@ -434,6 +434,7 @@ collectionbrowser.h genericmediadevice.h tqpopupmenu.h + kactivelabel.h TQPopupMenu *m_unsupportedMenu; @@ -457,7 +458,4 @@ destroy() - - kactivelabel.h - diff --git a/amarok/src/newdynamic.ui b/amarok/src/newdynamic.ui index af4ea8b1..47e02f57 100644 --- a/amarok/src/newdynamic.ui +++ b/amarok/src/newdynamic.ui @@ -352,9 +352,8 @@ m_upcomingIntSpinBox - - knuminput.h - knuminput.h - playlistselection.h - + + knuminput.h + playlistselection.h + diff --git a/amarok/src/organizecollectiondialog.ui b/amarok/src/organizecollectiondialog.ui index 1f9548ef..2f5740a6 100644 --- a/amarok/src/organizecollectiondialog.ui +++ b/amarok/src/organizecollectiondialog.ui @@ -563,6 +563,9 @@ metabundle.h tqdialog.h tqstring.h + kcombobox.h + klineedit.h + kactivelabel.h MetaBundle previewBundle; @@ -586,11 +589,4 @@ init() - - kcombobox.h - klineedit.h - kactivelabel.h - klineedit.h - klineedit.h - diff --git a/amarok/src/podcastsettingsbase.ui b/amarok/src/podcastsettingsbase.ui index c503b4e7..124bbf72 100644 --- a/amarok/src/podcastsettingsbase.ui +++ b/amarok/src/podcastsettingsbase.ui @@ -211,9 +211,9 @@ - - kurlrequester.h - klineedit.h - kpushbutton.h - + + kurlrequester.h + klineedit.h + kpushbutton.h + diff --git a/amarok/src/scriptmanagerbase.ui b/amarok/src/scriptmanagerbase.ui index c3ca95aa..b5809495 100644 --- a/amarok/src/scriptmanagerbase.ui +++ b/amarok/src/scriptmanagerbase.ui @@ -129,6 +129,7 @@ kdialog.h + tdelistview.h diff --git a/amarok/src/scripts/graphequalizer/eqdialog.ui b/amarok/src/scripts/graphequalizer/eqdialog.ui index ef2e1b16..96e869bf 100644 --- a/amarok/src/scripts/graphequalizer/eqdialog.ui +++ b/amarok/src/scripts/graphequalizer/eqdialog.ui @@ -198,6 +198,7 @@ eqdialog.ui.h + equalizercanvasview.h eqGroupBox_toggled( bool eqEnabled ) @@ -206,7 +207,4 @@ init() - - equalizercanvasview.h - diff --git a/amarok/src/tagdialogbase.ui b/amarok/src/tagdialogbase.ui index 589f6fb1..ab8aa969 100644 --- a/amarok/src/tagdialogbase.ui +++ b/amarok/src/tagdialogbase.ui @@ -821,26 +821,12 @@ - - klineedit.h - ktabwidget.h - coverfetcher.h - kcombobox.h - klineedit.h - klineedit.h - knuminput.h - knuminput.h - ktextedit.h - kcombobox.h - klineedit.h - knuminput.h - kcombobox.h - klineedit.h - kcombobox.h - klineedit.h - ktextedit.h - knuminput.h - kcombobox.h - ktextedit.h - + + klineedit.h + ktabwidget.h + coverfetcher.h + kcombobox.h + knuminput.h + ktextedit.h + diff --git a/amarok/src/tagguesserconfigdialog.ui b/amarok/src/tagguesserconfigdialog.ui index 49fb9219..6556725d 100644 --- a/amarok/src/tagguesserconfigdialog.ui +++ b/amarok/src/tagguesserconfigdialog.ui @@ -190,6 +190,8 @@ Note that the order in which the schemes appear in the list is relevant, since t kdialog.h + tdelistview.h + kpushbutton.h slotCurrentChanged( TQListViewItem * item ) @@ -210,13 +212,4 @@ Note that the order in which the schemes appear in the list is relevant, since t - - kdialog.h - tdelistview.h - kpushbutton.h - kpushbutton.h - kpushbutton.h - kpushbutton.h - kpushbutton.h - diff --git a/amarok/src/trackpickerdialogbase.ui b/amarok/src/trackpickerdialogbase.ui index b997554d..e01a2c50 100644 --- a/amarok/src/trackpickerdialogbase.ui +++ b/amarok/src/trackpickerdialogbase.ui @@ -176,7 +176,7 @@ trackList - - tdelistview.h - + + tdelistview.h +