TQt4 port kdemultimedia

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

3 files changed, 13 insertions, 11 deletions

diff --git a/noatun/modules/metatag/edit.cpp b/noatun/modules/metatag/edit.cpp
index 83c53c1f..dd4390db 100644
--- a/noatun/modules/metatag/edit.cpp
+++ b/noatun/modules/metatag/edit.cpp
@@ -37,9 +37,9 @@ Editor::Editor()
     TQHBox *heading = new TQHBox(mMainWidget, "Editor::heading");
     heading->setSpacing(4);
     mFileIcon = new TQLabel(heading);
-    mFileIcon->setAlignment(AlignVCenter | AlignLeft);
+    mFileIcon->tqsetAlignment(AlignVCenter | AlignLeft);
     mFile = new TQLabel(heading);
-    mFile->setAlignment(AlignVCenter | AlignLeft);
+    mFile->tqsetAlignment(AlignVCenter | AlignLeft);
     heading->setStretchFactor(mFile, 2);
     mGrid->addMultiCellWidget(heading, 0, 0, 0, 2);
 
@@ -53,7 +53,7 @@ Editor::Editor()
     connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(save()));
 
     enableButtonSeparator(true);
-    setFixedHeight(sizeHint().height());
+    setFixedHeight(tqsizeHint().height());
 }
 
 void Editor::open(const PlaylistItem & file)
@@ -158,7 +158,7 @@ void Editor::saveControl(KFileMetaInfo& meta_info, const MetaWidget &meta_widget
          kdWarning() << "Cannot save " << meta_widget.key << " as required type." << endl;
 }
 
-MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *parent) {
+MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *tqparent) {
     TQLabel *tmp_label = 0L;
     KFileMetaInfoItem info_item = meta_info.item(key);
     TQVariant::Type type;
@@ -182,7 +182,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe
 
     // Get the correct validator
     if ( info && !groupName.isNull() )
-        validator = info->createValidator( groupName, key, parent );
+        validator = info->createValidator( groupName, key, TQT_TQOBJECT(tqparent) );
 
     // meta_widget is used for book-keeping internally
     meta_widget = new MetaWidget;
@@ -190,7 +190,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe
 
     if ((type == TQVariant::Int) || (type == TQVariant::UInt)) {
         // We're an int, make a spin box
-        TQSpinBox *box = new TQSpinBox(parent);
+        TQSpinBox *box = new TQSpinBox(tqparent);
 
         // Well, normally metatag doesn't care that much about suffixes
         // and prefixes, but this is just too easy.
@@ -226,7 +226,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe
            combo_box = validator->isA("KStringListValidator");
 
         if (combo_box) {
-             TQComboBox *combo = new TQComboBox(parent);
+             TQComboBox *combo = new TQComboBox(tqparent);
 
              combo->clear();
              combo->insertStringList(static_cast<
@@ -241,7 +241,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe
         else {
              KLineEdit *edit;
 
-             edit = new KLineEdit(parent);
+             edit = new KLineEdit(tqparent);
              edit->setText(info_item.value().toString());
              edit->setValidator(validator);
              connect(edit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(modified()));
@@ -258,7 +258,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe
     mGrid->addMultiCellWidget(meta_widget->widget, mNextRow, mNextRow, 1, 2);
 
     // Add our label. This is the easy part
-    tmp_label = new TQLabel(meta_widget->widget, label + ":", parent);
+    tmp_label = new TQLabel(meta_widget->widget, label + ":", tqparent);
     mGrid->addWidget(tmp_label, mNextRow, 0);
 
 
@@ -277,7 +277,7 @@ TQString Editor::keyGroup(const KFileMetaInfo& i, TQString key) {
         }
     }
 
-    return TQString::null;
+    return TQString();
 }
 
 bool Editor::keyAddable(const KFileMetaInfo &i, TQString key) {
diff --git a/noatun/modules/metatag/edit.h b/noatun/modules/metatag/edit.h
index e2d53f89..f0e94778 100644
--- a/noatun/modules/metatag/edit.h
+++ b/noatun/modules/metatag/edit.h
@@ -17,6 +17,7 @@ struct MetaWidget {
 
 class Editor:public KDialogBase {
     Q_OBJECT
+  TQ_OBJECT
   public:
     Editor();
 
@@ -35,7 +36,7 @@ class Editor:public KDialogBase {
     TQString keyGroup(const KFileMetaInfo &, TQString);
 
     void saveControl(KFileMetaInfo& meta_info, const MetaWidget&);
-    MetaWidget *createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *parent);
+    MetaWidget *createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *tqparent);
 
     TQPtrList<MetaWidget> mControls;
 
diff --git a/noatun/modules/metatag/metatag.h b/noatun/modules/metatag/metatag.h
index 4559edaf..05dbd5b5 100644
--- a/noatun/modules/metatag/metatag.h
+++ b/noatun/modules/metatag/metatag.h
@@ -13,6 +13,7 @@ class KAction;
 
 class MetaTagLoader:public TQObject, public Tags, public Plugin {
   Q_OBJECT
+  TQ_OBJECT
   public:
     MetaTagLoader();
     ~MetaTagLoader();