summaryrefslogtreecommitdiffstats
path: root/kicker/applets/media
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/applets/media')
-rw-r--r--kicker/applets/media/mediaapplet.cpp14
-rw-r--r--kicker/applets/media/mediumbutton.cpp8
-rw-r--r--kicker/applets/media/preferencesdialog.cpp8
3 files changed, 15 insertions, 15 deletions
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index b137b5d5c..25b5869ff 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -154,7 +154,7 @@ void MediaApplet::arrangeButtons()
MediumButton *button = *it;
button_size = std::max(button_size,
- orientation() == Vertical ?
+ orientation() == Qt::Vertical ?
button->heightForWidth(width()) :
button->widthForHeight(height()) );
// button->widthForHeight(height()) :
@@ -162,7 +162,7 @@ void MediaApplet::arrangeButtons()
}
int kicker_size;
- if (orientation() == Vertical)
+ if (orientation() == Qt::Vertical)
{
kicker_size = width();
}
@@ -200,7 +200,7 @@ void MediaApplet::arrangeButtons()
++pack_count;
- if(orientation() == Vertical)
+ if(orientation() == Qt::Vertical)
{
if (pack_count < max_packed_buttons)
{
@@ -285,7 +285,7 @@ void MediaApplet::slotNewItems(const KFileItemList &entries)
}
}
- if(!found && !mExcludedList.contains(it.current()->url().url()) )
+ if(!found && !mExcludedList.tqcontains(it.current()->url().url()) )
{
MediumButton *button = new MediumButton(this, *it.current());
button->show();
@@ -336,7 +336,7 @@ void MediaApplet::slotRefreshItems(const KFileItemList &entries)
if(button->fileItem().url()==(*it.current()).url())
{
- if(mExcludedTypesList.contains(mimetype))
+ if(mExcludedTypesList.tqcontains(mimetype))
{
mButtonList.remove(button);
delete button;
@@ -350,7 +350,7 @@ void MediaApplet::slotRefreshItems(const KFileItemList &entries)
}
}
- if(!found && !mExcludedTypesList.contains(mimetype) && !mExcludedList.contains(it.current()->url().url()) )
+ if(!found && !mExcludedTypesList.tqcontains(mimetype) && !mExcludedList.tqcontains(it.current()->url().url()) )
{
MediumButton *button = new MediumButton(this, *it.current());
button->show();
@@ -425,7 +425,7 @@ void MediaApplet::reloadList()
void MediaApplet::mousePressEvent(TQMouseEvent *e)
{
- if(e->button()==RightButton)
+ if(e->button()==Qt::RightButton)
{
KPopupMenu menu(this);
diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp
index 0fae43441..1e71fbd6f 100644
--- a/kicker/applets/media/mediumbutton.cpp
+++ b/kicker/applets/media/mediumbutton.cpp
@@ -45,13 +45,13 @@
#include <konq_drag.h>
MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem)
- : PanelPopupButton(parent), mActions(this, this), mFileItem(fileItem), mOpenTimer(0,
+ : PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), mFileItem(fileItem), mOpenTimer(0,
"MediumButton::mOpenTimer")
{
- KAction *a = KStdAction::paste(this, TQT_SLOT(slotPaste()),
+ KAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()),
&mActions, "pasteto");
a->setShortcut(0);
- a = KStdAction::copy(this, TQT_SLOT(slotCopy()), &mActions, "copy");
+ a = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), &mActions, "copy");
a->setShortcut(0);
setBackgroundOrigin(AncestorOrigin);
@@ -145,7 +145,7 @@ void MediumButton::slotCopy()
{
KonqDrag * obj = KonqDrag::newDrag(mFileItem.url(), false);
- TQApplication::clipboard()->setData( obj );
+ TQApplication::tqclipboard()->setData( obj );
}
void MediumButton::dragEnterEvent(TQDragEnterEvent* e)
diff --git a/kicker/applets/media/preferencesdialog.cpp b/kicker/applets/media/preferencesdialog.cpp
index 8d9cdcc94..3833f5062 100644
--- a/kicker/applets/media/preferencesdialog.cpp
+++ b/kicker/applets/media/preferencesdialog.cpp
@@ -26,7 +26,7 @@
#include <klistview.h>
#include <kfiledetailview.h>
-class MediumTypeItem : public QCheckListItem
+class MediumTypeItem : public TQCheckListItem
{
public:
MediumTypeItem(TQListView *parent, const TQString name,
@@ -40,7 +40,7 @@ private:
TQString mMimeType;
};
-class MediumItem : public QCheckListItem
+class MediumItem : public TQCheckListItem
{
public:
MediumItem(TQListView *parent, const TQString name,
@@ -125,7 +125,7 @@ void PreferencesDialog::setExcludedMediumTypes(TQStringList excludedTypesList)
{
if ((*it)->name().startsWith("media/"))
{
- bool ok=excludedTypesList.contains((*it)->name())==0;
+ bool ok=excludedTypesList.tqcontains((*it)->name())==0;
MediumTypeItem *item = new MediumTypeItem(mpMediumTypesListView, (*it)->comment(), (*it)->name());
item->setOn(ok);
}
@@ -156,7 +156,7 @@ void PreferencesDialog::setExcludedMedia(TQStringList excludedList)
{
++it;
- bool ok = excludedList.contains(file->url().url())==0;
+ bool ok = excludedList.tqcontains(file->url().url())==0;
MediumItem *item = new MediumItem(mpMediaListView,
file->text(), *file);
item->setOn(ok);