summaryrefslogtreecommitdiffstats
path: root/kio/bookmarks
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-15 19:11:41 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-15 19:11:41 +0000
commit374d939d8af431477ce2601815f0ba121b66871c (patch)
treead878478dcc0bedf51e3cffb2ed611ada422b290 /kio/bookmarks
parentf9279733bf71e446933b46f40cbe9c9b9f57b778 (diff)
downloadtdelibs-374d939d8af431477ce2601815f0ba121b66871c.tar.gz
tdelibs-374d939d8af431477ce2601815f0ba121b66871c.zip
Allow kdelibs to function correctly with TQt for Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1220926 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kio/bookmarks')
-rw-r--r--kio/bookmarks/kbookmarkbar.cc8
-rw-r--r--kio/bookmarks/kbookmarkmenu.cc24
2 files changed, 16 insertions, 16 deletions
diff --git a/kio/bookmarks/kbookmarkbar.cc b/kio/bookmarks/kbookmarkbar.cc
index 4709988a4..158caf373 100644
--- a/kio/bookmarks/kbookmarkbar.cc
+++ b/kio/bookmarks/kbookmarkbar.cc
@@ -200,8 +200,8 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent)
else
{
KAction *action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 );
- connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, Qt::ButtonState )),
- this, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, Qt::ButtonState ) ));
+ connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, TQt::ButtonState )),
+ this, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, TQt::ButtonState ) ));
action->setProperty( "url", bm.url().url() );
action->setProperty( "address", bm.address() );
@@ -231,8 +231,8 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent)
bm.address());
connect(menu, TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) ),
this, TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) ));
- connect(menu, TQT_SIGNAL( openBookmark( const TQString &, Qt::ButtonState) ),
- this, TQT_SIGNAL( openBookmark( const TQString &, Qt::ButtonState) ));
+ connect(menu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) ),
+ this, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) ));
menu->fillBookmarkMenu();
action->plug(m_toolBar);
m_lstSubMenus.append( menu );
diff --git a/kio/bookmarks/kbookmarkmenu.cc b/kio/bookmarks/kbookmarkmenu.cc
index 916690c19..a4195409b 100644
--- a/kio/bookmarks/kbookmarkmenu.cc
+++ b/kio/bookmarks/kbookmarkmenu.cc
@@ -404,9 +404,9 @@ void RMB::slotRMBActionCopyLocation( int val )
if ( !bookmark.isGroup() )
{
kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
- QClipboard::Selection );
+ TQClipboard::Selection );
kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
- QClipboard::Clipboard );
+ TQClipboard::Clipboard );
}
}
@@ -609,8 +609,8 @@ void KBookmarkMenu::fillBookmarkMenu()
new KBookmarkMenu( m_pManager, m_pOwner, actionMenu->popupMenu(),
m_actionCollection, false,
m_bAddBookmark, TQString::null );
- connect( subMenu, TQT_SIGNAL( openBookmark( const TQString &, Qt::ButtonState ) ),
- this, TQT_SIGNAL( openBookmark( const TQString &, Qt::ButtonState ) ));
+ connect( subMenu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ),
+ this, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ));
m_lstSubMenus.append(subMenu);
connect(actionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), subMenu, TQT_SLOT(slotNSLoad()));
@@ -639,8 +639,8 @@ void KBookmarkMenu::fillBookmarkMenu()
{
//kdDebug(7043) << "Creating URL bookmark menu item for " << bm.text() << endl;
KAction * action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 );
- connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, Qt::ButtonState )),
- this, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, Qt::ButtonState ) ));
+ connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, TQt::ButtonState )),
+ this, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, TQt::ButtonState ) ));
action->setProperty( "url", bm.url().url() );
action->setProperty( "address", bm.address() );
@@ -668,8 +668,8 @@ void KBookmarkMenu::fillBookmarkMenu()
connect(subMenu, TQT_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) ),
this, TQT_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) ));
- connect(subMenu, TQT_SIGNAL( openBookmark( const TQString &, Qt::ButtonState ) ),
- this, TQT_SIGNAL( openBookmark( const TQString &, Qt::ButtonState ) ));
+ connect(subMenu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ),
+ this, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ));
m_lstSubMenus.append( subMenu );
}
}
@@ -1058,8 +1058,8 @@ void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCStrin
TQString _text = KStringHandler::csqueeze(text);
_text.replace( '&', "&&" );
KAction * action = new KBookmarkAction(_text, "html", 0, 0, "", m_actionCollection, 0);
- connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, Qt::ButtonState )),
- m_menu, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, Qt::ButtonState ) ));
+ connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, TQt::ButtonState )),
+ m_menu, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, TQt::ButtonState ) ));
action->setProperty( "url", url );
action->setToolTip( url );
action->plug( mstack.top()->m_parentMenu );
@@ -1076,8 +1076,8 @@ void KBookmarkMenuNSImporter::newFolder( const TQString & text, bool, const TQSt
KBookmarkMenu *subMenu = new KBookmarkMenu( m_pManager, m_menu->m_pOwner, actionMenu->popupMenu(),
m_actionCollection, false,
m_menu->m_bAddBookmark, TQString::null );
- connect( subMenu, TQT_SIGNAL( openBookmark( const TQString &, Qt::ButtonState ) ),
- m_menu, TQT_SIGNAL( openBookmark( const TQString &, Qt::ButtonState ) ));
+ connect( subMenu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ),
+ m_menu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ));
mstack.top()->m_lstSubMenus.append( subMenu );
mstack.push(subMenu);