summaryrefslogtreecommitdiffstats
path: root/klipper
diff options
context:
space:
mode:
Diffstat (limited to 'klipper')
-rw-r--r--klipper/clipboardpoll.cpp6
-rw-r--r--klipper/configdialog.cpp26
-rw-r--r--klipper/history.cpp2
-rw-r--r--klipper/klipperbindings.cpp2
-rw-r--r--klipper/klipperpopup.cpp2
-rw-r--r--klipper/popupproxy.cpp6
-rw-r--r--klipper/toplevel.cpp46
-rw-r--r--klipper/urlgrabber.cpp10
8 files changed, 50 insertions, 50 deletions
diff --git a/klipper/clipboardpoll.cpp b/klipper/clipboardpoll.cpp
index ff6c50cef..a2f5368a8 100644
--- a/klipper/clipboardpoll.cpp
+++ b/klipper/clipboardpoll.cpp
@@ -108,9 +108,9 @@ ClipboardPoll::ClipboardPoll( TQWidget* parent )
void ClipboardPoll::initPolling()
{
- connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged() ), TQT_SLOT(qtSelectionChanged()));
- connect( kapp->clipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( qtClipboardChanged() ));
- connect( &timer, TQT_SIGNAL( timeout()), TQT_SLOT( timeout()));
+ connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged() ), TQ_SLOT(qtSelectionChanged()));
+ connect( kapp->clipboard(), TQ_SIGNAL( dataChanged() ), TQ_SLOT( qtClipboardChanged() ));
+ connect( &timer, TQ_SIGNAL( timeout()), TQ_SLOT( timeout()));
timer.start( 1000, false );
selection.atom = XA_PRIMARY;
clipboard.atom = xa_clipboard;
diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp
index c44e11afe..0dfc7ede1 100644
--- a/klipper/configdialog.cpp
+++ b/klipper/configdialog.cpp
@@ -158,11 +158,11 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name )
maxItems = new KIntNumInput( this );
maxItems->setLabel( i18n( "C&lipboard history size:" ) );
maxItems->setRange( 2, 2048, 1, true );
- connect( maxItems, TQT_SIGNAL( valueChanged( int )),
- TQT_SLOT( historySizeChanged( int ) ));
+ connect( maxItems, TQ_SIGNAL( valueChanged( int )),
+ TQ_SLOT( historySizeChanged( int ) ));
- connect( group, TQT_SIGNAL( clicked( int )),
- TQT_SLOT( slotClipConfigChanged() ));
+ connect( group, TQ_SIGNAL( clicked( int )),
+ TQ_SLOT( slotClipConfigChanged() ));
slotClipConfigChanged();
// Add some spacing at the end
@@ -243,13 +243,13 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget,
listView->setMultiSelection( false );
listView->setAllColumnsShowFocus( true );
listView->setSelectionMode( TQListView::Single );
- connect( listView, TQT_SIGNAL(executed( TQListViewItem*, const TQPoint&, int )),
- TQT_SLOT( slotItemChanged( TQListViewItem*, const TQPoint& , int ) ));
- connect( listView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )),
- TQT_SLOT(selectionChanged ( TQListViewItem * )));
+ connect( listView, TQ_SIGNAL(executed( TQListViewItem*, const TQPoint&, int )),
+ TQ_SLOT( slotItemChanged( TQListViewItem*, const TQPoint& , int ) ));
+ connect( listView, TQ_SIGNAL( selectionChanged ( TQListViewItem * )),
+ TQ_SLOT(selectionChanged ( TQListViewItem * )));
connect(listView,
- TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&)),
- TQT_SLOT( slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
+ TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&)),
+ TQ_SLOT( slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
ClipAction *action = 0L;
ClipCommand *command = 0L;
@@ -291,10 +291,10 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget,
TQHBox *box = new TQHBox( this );
box->setSpacing( KDialog::spacingHint() );
TQPushButton *button = new TQPushButton( i18n("&Add Action"), box );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddAction() ));
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAddAction() ));
delActionButton = new TQPushButton( i18n("&Delete Action"), box );
- connect( delActionButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDeleteAction() ));
+ connect( delActionButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDeleteAction() ));
TQLabel *label = new TQLabel(i18n("Click on a highlighted item's column to change it. \"%s\" in a command will be replaced with the clipboard contents."), box);
label->setAlignment( WordBreak | AlignLeft | AlignVCenter );
@@ -304,7 +304,7 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget,
box = new TQHBox( this );
TQPushButton *advanced = new TQPushButton( i18n("Advanced..."), box );
advanced->setFixedSize( advanced->sizeHint() );
- connect( advanced, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdvanced() ));
+ connect( advanced, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdvanced() ));
(void) new TQWidget( box ); // spacer
delActionButton->setEnabled(listView->currentItem () !=0);
diff --git a/klipper/history.cpp b/klipper/history.cpp
index 625fbef0f..99db4eaba 100644
--- a/klipper/history.cpp
+++ b/klipper/history.cpp
@@ -29,7 +29,7 @@ History::History( TQWidget* parent, const char* name )
m_popup( new KlipperPopup( this, parent, "main_widget" ) ),
m_topIsUserSelected( false )
{
- connect( this, TQT_SIGNAL( changed() ), m_popup, TQT_SLOT( slotHistoryChanged() ) );
+ connect( this, TQ_SIGNAL( changed() ), m_popup, TQ_SLOT( slotHistoryChanged() ) );
itemList.setAutoDelete( true );
}
diff --git a/klipper/klipperbindings.cpp b/klipper/klipperbindings.cpp
index dd14ad3c4..8db1f5fe8 100644
--- a/klipper/klipperbindings.cpp
+++ b/klipper/klipperbindings.cpp
@@ -18,7 +18,7 @@
*/
#ifndef NOSLOTS
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), TQString(), key3, key4, this, TQT_SLOT(fnSlot) )
+ keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) )
#else
# define DEF( name, key3, key4, fnSlot ) \
keys->insert( name, i18n(name), TQString(), key3, key4 )
diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp
index 9d3ab728d..38cd51aa5 100644
--- a/klipper/klipperpopup.cpp
+++ b/klipper/klipperpopup.cpp
@@ -112,7 +112,7 @@ KlipperPopup::KlipperPopup( History* history, TQWidget* parent, const char* name
m_popupProxy = new PopupProxy( this, "popup_proxy", menu_height, menu_width );
- connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) );
+ connect( this, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotAboutToShow() ) );
}
KlipperPopup::~KlipperPopup() {
diff --git a/klipper/popupproxy.cpp b/klipper/popupproxy.cpp
index f3a86379f..20f8139a1 100644
--- a/klipper/popupproxy.cpp
+++ b/klipper/popupproxy.cpp
@@ -39,7 +39,7 @@ PopupProxy::PopupProxy( KlipperPopup* parent, const char* name, int menu_height,
m_menu_width( menu_width ),
nextItemNumber( 0 )
{
- connect( parent->history(), TQT_SIGNAL( changed() ), TQT_SLOT( slotHistoryChanged() ) );
+ connect( parent->history(), TQ_SIGNAL( changed() ), TQ_SLOT( slotHistoryChanged() ) );
}
void PopupProxy::slotHistoryChanged() {
@@ -117,7 +117,7 @@ void PopupProxy::tryInsertItem( HistoryItem const * const item,
History* history = parent()->history();
proxy_for_menu->connectItem( id,
history,
- TQT_SLOT( slotMoveToTop( int ) ) );
+ TQ_SLOT( slotMoveToTop( int ) ) );
proxy_for_menu->setItemParameter( id, nextItemNumber );
}
@@ -151,7 +151,7 @@ int PopupProxy::insertFromSpill( int index ) {
if ( spillPointer.current() ) {
TDEPopupMenu* moreMenu = new TDEPopupMenu( proxy_for_menu, "a more menu" );
proxy_for_menu->insertItem( i18n( "&More" ), moreMenu, -1, index );
- connect( moreMenu, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) );
+ connect( moreMenu, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotAboutToShow() ) );
proxy_for_menu = moreMenu;
}
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index c764b0003..b76c7472b 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -140,10 +140,10 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
setBackgroundMode( X11ParentRelative );
clip = kapp->clipboard();
- connect( &m_overflowClearTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotClearOverflow()));
+ connect( &m_overflowClearTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotClearOverflow()));
m_overflowClearTimer.start( 1000 );
- connect( &m_pendingCheckTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotCheckPending()));
- connect( &m_setClipboardTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotDelayedSetClipboard()));
+ connect( &m_pendingCheckTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotCheckPending()));
+ connect( &m_setClipboardTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotDelayedSetClipboard()));
m_history = new History( this, "main_history" );
@@ -157,16 +157,16 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
"history_clear",
0,
history(),
- TQT_SLOT( slotClear() ),
+ TQ_SLOT( slotClear() ),
collection,
"clearHistoryAction" );
- connect( clearHistoryAction, TQT_SIGNAL( activated() ), TQT_SLOT( slotClearClipboard() ) );
+ connect( clearHistoryAction, TQ_SIGNAL( activated() ), TQ_SLOT( slotClearClipboard() ) );
clearHistoryAction->setGroup( defaultGroup );
configureAction = new TDEAction( i18n("&Configure Klipper..."),
"configure",
0,
this,
- TQT_SLOT( slotConfigure() ),
+ TQ_SLOT( slotConfigure() ),
collection,
"configureAction" );
configureAction->setGroup( defaultGroup );
@@ -174,7 +174,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
"system-log-out",
0,
this,
- TQT_SLOT( slotQuit() ),
+ TQ_SLOT( slotQuit() ),
collection,
"quitAction" );
quitAction->setGroup( "exit" );
@@ -187,11 +187,11 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
showTimer = new TQTime();
readProperties(m_config);
- connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
+ connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
poll = new ClipboardPoll( this );
- connect( poll, TQT_SIGNAL( clipboardChanged( bool ) ),
- this, TQT_SLOT( newClipData( bool ) ) );
+ connect( poll, TQ_SIGNAL( clipboardChanged( bool ) ),
+ this, TQ_SLOT( newClipData( bool ) ) );
if ( isApplet() || !isShown() ) {
m_pixmap = KSystemTray::loadIcon( "klipper" );
@@ -211,13 +211,13 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
globalKeys->updateConnections();
toggleURLGrabAction->setShortcut(globalKeys->shortcut("Enable/Disable Clipboard Actions"));
- connect( toggleURLGrabAction, TQT_SIGNAL( toggled( bool )),
- this, TQT_SLOT( setURLGrabberEnabled( bool )));
+ connect( toggleURLGrabAction, TQ_SIGNAL( toggled( bool )),
+ this, TQ_SLOT( setURLGrabberEnabled( bool )));
KlipperPopup* popup = history()->popup();
- connect ( history(), TQT_SIGNAL( topChanged() ), TQT_SLOT( slotHistoryTopChanged() ) );
- connect( popup, TQT_SIGNAL( aboutToHide() ), TQT_SLOT( slotStartHideTimer() ) );
- connect( popup, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotStartShowTimer() ) );
+ connect ( history(), TQ_SIGNAL( topChanged() ), TQ_SLOT( slotHistoryTopChanged() ) );
+ connect( popup, TQ_SIGNAL( aboutToHide() ), TQ_SLOT( slotStartHideTimer() ) );
+ connect( popup, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotStartShowTimer() ) );
popup->plugAction( toggleURLGrabAction );
popup->plugAction( clearHistoryAction );
@@ -631,10 +631,10 @@ void KlipperWidget::slotRepeatAction()
{
if ( !myURLGrabber ) {
myURLGrabber = new URLGrabber( m_config );
- connect( myURLGrabber, TQT_SIGNAL( sigPopup( TQPopupMenu * )),
- TQT_SLOT( showPopupMenu( TQPopupMenu * )) );
- connect( myURLGrabber, TQT_SIGNAL( sigDisablePopup() ),
- this, TQT_SLOT( disableURLGrabber() ) );
+ connect( myURLGrabber, TQ_SIGNAL( sigPopup( TQPopupMenu * )),
+ TQ_SLOT( showPopupMenu( TQPopupMenu * )) );
+ connect( myURLGrabber, TQ_SIGNAL( sigDisablePopup() ),
+ this, TQ_SLOT( disableURLGrabber() ) );
}
const HistoryStringItem* top = dynamic_cast<const HistoryStringItem*>( history()->first() );
@@ -666,10 +666,10 @@ void KlipperWidget::setURLGrabberEnabled( bool enable )
toggleURLGrabAction->setText(i18n("&Actions Enabled"));
if ( !myURLGrabber ) {
myURLGrabber = new URLGrabber( m_config );
- connect( myURLGrabber, TQT_SIGNAL( sigPopup( TQPopupMenu * )),
- TQT_SLOT( showPopupMenu( TQPopupMenu * )) );
- connect( myURLGrabber, TQT_SIGNAL( sigDisablePopup() ),
- this, TQT_SLOT( disableURLGrabber() ) );
+ connect( myURLGrabber, TQ_SIGNAL( sigPopup( TQPopupMenu * )),
+ TQ_SLOT( showPopupMenu( TQPopupMenu * )) );
+ connect( myURLGrabber, TQ_SIGNAL( sigDisablePopup() ),
+ this, TQ_SLOT( disableURLGrabber() ) );
}
}
}
diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
index b8b1cb032..078e38097 100644
--- a/klipper/urlgrabber.cpp
+++ b/klipper/urlgrabber.cpp
@@ -61,8 +61,8 @@ URLGrabber::URLGrabber( TDEConfig* config )
readConfiguration( m_config );
myPopupKillTimer = new TQTimer( this );
- connect( myPopupKillTimer, TQT_SIGNAL( timeout() ),
- TQT_SLOT( slotKillPopupMenu() ));
+ connect( myPopupKillTimer, TQ_SIGNAL( timeout() ),
+ TQ_SLOT( slotKillPopupMenu() ));
// testing
/*
@@ -163,8 +163,8 @@ void URLGrabber::actionMenu( bool wm_class_check )
myPopupKillTimer->stop();
delete myMenu;
myMenu = new TDEPopupMenu;
- connect( myMenu, TQT_SIGNAL( activated( int )),
- TQT_SLOT( slotItemSelected( int )));
+ connect( myMenu, TQ_SIGNAL( activated( int )),
+ TQ_SLOT( slotItemSelected( int )));
for ( action = it.current(); action; action = ++it ) {
TQPtrListIterator<ClipCommand> it2( action->commands() );
@@ -279,7 +279,7 @@ void URLGrabber::editData()
if ( dlg->exec() == TQDialog::Accepted ) {
myClipData = edit->text();
delete dlg;
- TQTimer::singleShot( 0, this, TQT_SLOT( slotActionMenu() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotActionMenu() ) );
}
else
{