summaryrefslogtreecommitdiffstats
path: root/klipper
diff options
context:
space:
mode:
Diffstat (limited to 'klipper')
-rw-r--r--klipper/configdialog.cpp12
-rw-r--r--klipper/configdialog.h12
-rw-r--r--klipper/klipperpopup.cpp14
-rw-r--r--klipper/klipperpopup.h8
-rw-r--r--klipper/popupproxy.cpp10
-rw-r--r--klipper/popupproxy.h2
-rw-r--r--klipper/toplevel.cpp12
-rw-r--r--klipper/toplevel.h12
-rw-r--r--klipper/urlgrabber.cpp4
-rw-r--r--klipper/urlgrabber.h4
10 files changed, 45 insertions, 45 deletions
diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp
index fd81beffc..0c1b5379a 100644
--- a/klipper/configdialog.cpp
+++ b/klipper/configdialog.cpp
@@ -214,7 +214,7 @@ void ListView::rename( TQListViewItem* item, int c )
}
else
- KListView::rename( item ,c );
+ TDEListView::rename( item ,c );
}
@@ -250,8 +250,8 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget,
connect( listView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )),
TQT_SLOT(selectionChanged ( TQListViewItem * )));
connect(listView,
- TQT_SIGNAL(contextMenu(KListView *, TQListViewItem *, const TQPoint&)),
- TQT_SLOT( slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)));
+ TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&)),
+ TQT_SLOT( slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
ClipAction *action = 0L;
ClipCommand *command = 0L;
@@ -321,14 +321,14 @@ void ActionWidget::selectionChanged ( TQListViewItem * item)
delActionButton->setEnabled(item!=0);
}
-void ActionWidget::slotContextMenu( KListView *, TQListViewItem *item,
+void ActionWidget::slotContextMenu( TDEListView *, TQListViewItem *item,
const TQPoint& pos )
{
if ( !item )
return;
int addCmd = 0, rmCmd = 0;
- KPopupMenu *menu = new KPopupMenu;
+ TDEPopupMenu *menu = new TDEPopupMenu;
addCmd = menu->insertItem( i18n("Add Command") );
rmCmd = menu->insertItem( i18n("Remove Command") );
if ( !item->parent() ) {// no "command" item
@@ -451,7 +451,7 @@ void AdvancedWidget::setWMClasses( const TQStringList& items )
//////////
/*
-KeysWidget::KeysWidget( KAccelActions &keyMap, TQWidget *parent, const char *name)
+KeysWidget::KeysWidget( TDEAccelActions &keyMap, TQWidget *parent, const char *name)
: TQVBox( parent, name )
{
keyChooser = new KKeyChooser( keyMap, this );
diff --git a/klipper/configdialog.h b/klipper/configdialog.h
index 7db964b4c..c77514857 100644
--- a/klipper/configdialog.h
+++ b/klipper/configdialog.h
@@ -37,7 +37,7 @@
class TDEGlobalAccel;
class KKeyChooser;
-class KListView;
+class TDEListView;
class TQPushButton;
class TQDialog;
class ConfigDialog;
@@ -106,11 +106,11 @@ private slots:
void slotDeleteAction();
void slotItemChanged( TQListViewItem *, const TQPoint& , int );
void slotAdvanced();
- void slotContextMenu( KListView *, TQListViewItem *, const TQPoint& );
+ void slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint& );
void selectionChanged ( TQListViewItem *);
private:
- KListView *listView;
+ TDEListView *listView;
TQStringList m_wmClasses;
AdvancedWidget *advancedWidget;
TQPushButton *delActionButton;
@@ -124,7 +124,7 @@ private:
friend class ConfigDialog;
public:
- KeysWidget( KAccelActions &keyMap, TQWidget *parent, const char *name );
+ KeysWidget( TDEAccelActions &keyMap, TQWidget *parent, const char *name );
~KeysWidget();
private:
@@ -231,11 +231,11 @@ private:
};
-class ListView : public KListView
+class ListView : public TDEListView
{
public:
ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name )
- : KListView( parent, name ), _configWidget( configWidget ),
+ : TDEListView( parent, name ), _configWidget( configWidget ),
_regExpEditor(0L) {}
// TQListView has a weird idea of a sizeHint...
virtual TQSize sizeHint () const {
diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp
index 3e1db75bd..048ea8b1b 100644
--- a/klipper/klipperpopup.cpp
+++ b/klipper/klipperpopup.cpp
@@ -94,7 +94,7 @@ protected:
};
KlipperPopup::KlipperPopup( History* history, TQWidget* parent, const char* name )
- : KPopupMenu( parent, name ),
+ : TDEPopupMenu( parent, name ),
m_dirty( true ),
QSempty( i18n( "<empty clipboard>" ) ),
QSnomatch( i18n( "<no matches>" ) ),
@@ -155,7 +155,7 @@ void KlipperPopup::buildFromScratch() {
// Insert Help-menu at the butttom of the "default" group.
TQString group;
TQString defaultGroup( "default" );
- for ( KAction* action = m_actions.first(); action; action = m_actions.next() ) {
+ for ( TDEAction* action = m_actions.first(); action; action = m_actions.next() ) {
group = action->group();
if ( group != lastGroup ) {
if ( lastGroup == defaultGroup ) {
@@ -213,7 +213,7 @@ void KlipperPopup::rebuild( const TQString& filter ) {
}
-void KlipperPopup::plugAction( KAction* action ) {
+void KlipperPopup::plugAction( TDEAction* action ) {
m_actions.append( action );
}
@@ -233,9 +233,9 @@ void KlipperPopup::keyPressEvent( TQKeyEvent* e ) {
e->text(),
e->isAutoRepeat(),
e->count() );
- KPopupMenu::keyPressEvent( &ke );
+ TDEPopupMenu::keyPressEvent( &ke );
#ifdef DEBUG_EVENTS__
- kdDebug() << "Passing this event to ancestor (KPopupMenu): " << e "->" << ke << endl;
+ kdDebug() << "Passing this event to ancestor (TDEPopupMenu): " << e "->" << ke << endl;
#endif
if ( ke.isAccepted() ) {
e->accept();
@@ -260,9 +260,9 @@ void KlipperPopup::keyPressEvent( TQKeyEvent* e ) {
case Qt::Key_Enter:
{
#ifdef DEBUG_EVENTS__
- kdDebug() << "Passing this event to ancestor (KPopupMenu): " << e << endl;
+ kdDebug() << "Passing this event to ancestor (TDEPopupMenu): " << e << endl;
#endif
- KPopupMenu::keyPressEvent( e );
+ TDEPopupMenu::keyPressEvent( e );
if ( isItemActive( m_filterWidgetId ) ) {
setActiveItem( TOP_HISTORY_ITEM_INDEX );
}
diff --git a/klipper/klipperpopup.h b/klipper/klipperpopup.h
index 50ca55938..a9849e8c3 100644
--- a/klipper/klipperpopup.h
+++ b/klipper/klipperpopup.h
@@ -27,7 +27,7 @@
class History;
class KlipperWidget;
class KHelpMenu;
-class KAction;
+class TDEAction;
class PopupProxy;
class KLineEdit;
@@ -35,14 +35,14 @@ class KLineEdit;
* Default view of clipboard history.
*
*/
-class KlipperPopup : public KPopupMenu
+class KlipperPopup : public TDEPopupMenu
{
Q_OBJECT
public:
KlipperPopup( History* history, TQWidget* parent=0, const char* name=0 );
~KlipperPopup();
- void plugAction( KAction* action );
+ void plugAction( TDEAction* action );
/**
* Normally, the popupmenu is only rebuilt just before showing.
@@ -95,7 +95,7 @@ private:
/**
* (unowned) actions to plug into the primary popup menu
*/
- TQPtrList<KAction> m_actions;
+ TQPtrList<TDEAction> m_actions;
/**
* Proxy helper object used to track history items
diff --git a/klipper/popupproxy.cpp b/klipper/popupproxy.cpp
index bf4863607..d5c572690 100644
--- a/klipper/popupproxy.cpp
+++ b/klipper/popupproxy.cpp
@@ -49,13 +49,13 @@ void PopupProxy::slotHistoryChanged() {
}
void PopupProxy::deleteMoreMenus() {
- const KPopupMenu* myParent = parent();
+ const TDEPopupMenu* myParent = parent();
if ( myParent != proxy_for_menu ) {
- const KPopupMenu* delme = proxy_for_menu;;
- proxy_for_menu = static_cast<KPopupMenu*>( proxy_for_menu->parent() );
+ const TDEPopupMenu* delme = proxy_for_menu;;
+ proxy_for_menu = static_cast<TDEPopupMenu*>( proxy_for_menu->parent() );
while ( proxy_for_menu != myParent ) {
delme = proxy_for_menu;
- proxy_for_menu = static_cast<KPopupMenu*>( proxy_for_menu->parent() );
+ proxy_for_menu = static_cast<TDEPopupMenu*>( proxy_for_menu->parent() );
}
delete delme;
}
@@ -150,7 +150,7 @@ int PopupProxy::insertFromSpill( int index ) {
// If there is more items in the history, insert a new "More..." menu and
// make *this a proxy for that menu ('s content).
if ( spillPointer.current() ) {
- KPopupMenu* moreMenu = new KPopupMenu( proxy_for_menu, "a more menu" );
+ 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() ) );
proxy_for_menu = moreMenu;
diff --git a/klipper/popupproxy.h b/klipper/popupproxy.h
index 78dbbdc09..6526a8c55 100644
--- a/klipper/popupproxy.h
+++ b/klipper/popupproxy.h
@@ -81,7 +81,7 @@ private:
void deleteMoreMenus();
private:
- KPopupMenu* proxy_for_menu;
+ TDEPopupMenu* proxy_for_menu;
History::iterator spillPointer;
TQRegExp m_filter;
int m_menu_height;
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index b7832aae5..f9254dee3 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -150,13 +150,13 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
m_history = new History( this, "main_history" );
- // we need that collection, otherwise KToggleAction is not happy :}
+ // we need that collection, otherwise TDEToggleAction is not happy :}
TQString defaultGroup( "default" );
- KActionCollection *collection = new KActionCollection( this, "my collection" );
- toggleURLGrabAction = new KToggleAction( collection, "toggleUrlGrabAction" );
+ TDEActionCollection *collection = new TDEActionCollection( this, "my collection" );
+ toggleURLGrabAction = new TDEToggleAction( collection, "toggleUrlGrabAction" );
toggleURLGrabAction->setEnabled( true );
toggleURLGrabAction->setGroup( defaultGroup );
- clearHistoryAction = new KAction( i18n("C&lear Clipboard History"),
+ clearHistoryAction = new TDEAction( i18n("C&lear Clipboard History"),
"history_clear",
0,
TQT_TQOBJECT(history()),
@@ -165,7 +165,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
"clearHistoryAction" );
connect( clearHistoryAction, TQT_SIGNAL( activated() ), TQT_SLOT( slotClearClipboard() ) );
clearHistoryAction->setGroup( defaultGroup );
- configureAction = new KAction( i18n("&Configure Klipper..."),
+ configureAction = new TDEAction( i18n("&Configure Klipper..."),
"configure",
0,
TQT_TQOBJECT(this),
@@ -173,7 +173,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
collection,
"configureAction" );
configureAction->setGroup( defaultGroup );
- quitAction = new KAction( i18n("&Quit"),
+ quitAction = new TDEAction( i18n("&Quit"),
"exit",
0,
TQT_TQOBJECT(this),
diff --git a/klipper/toplevel.h b/klipper/toplevel.h
index 1d967a213..dc2682ea2 100644
--- a/klipper/toplevel.h
+++ b/klipper/toplevel.h
@@ -30,13 +30,13 @@
#include <tqtimer.h>
class TQClipboard;
-class KToggleAction;
+class TDEToggleAction;
class TDEAboutData;
class URLGrabber;
class ClipboardPoll;
class TQTime;
class History;
-class KAction;
+class TDEAction;
class TQMimeSource;
class HistoryItem;
class KlipperSessionManaged;
@@ -168,10 +168,10 @@ private:
int m_lastSelection;
History* m_history;
int m_overflowCounter;
- KToggleAction *toggleURLGrabAction;
- KAction* clearHistoryAction;
- KAction* configureAction;
- KAction* quitAction;
+ TDEToggleAction *toggleURLGrabAction;
+ TDEAction* clearHistoryAction;
+ TDEAction* configureAction;
+ TDEAction* quitAction;
TQPixmap m_pixmap;
TQPixmap m_scaledpixmap;
int m_iconOrigWidth;
diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
index c2952a736..5a93f1c10 100644
--- a/klipper/urlgrabber.cpp
+++ b/klipper/urlgrabber.cpp
@@ -40,7 +40,7 @@
// TODO:
// - script-interface?
-// - Bug in KPopupMenu::clear() (insertTitle() doesn't go away sometimes)
+// - Bug in TDEPopupMenu::clear() (insertTitle() doesn't go away sometimes)
#define URL_EDIT_ITEM 10
#define DO_NOTHING_ITEM 11
@@ -163,7 +163,7 @@ void URLGrabber::actionMenu( bool wm_class_check )
myPopupKillTimer->stop();
delete myMenu;
- myMenu = new KPopupMenu;
+ myMenu = new TDEPopupMenu;
connect( myMenu, TQT_SIGNAL( activated( int )),
TQT_SLOT( slotItemSelected( int )));
diff --git a/klipper/urlgrabber.h b/klipper/urlgrabber.h
index a40e48bf6..fd97067dc 100644
--- a/klipper/urlgrabber.h
+++ b/klipper/urlgrabber.h
@@ -32,7 +32,7 @@
class TQTimer;
class TDEConfig;
-class KPopupMenu;
+class TDEPopupMenu;
class ClipAction;
struct ClipCommand;
@@ -85,7 +85,7 @@ private:
ClipAction *myCurrentAction;
TQIntDict<ClipCommand> myCommandMapper;
TQIntDict<TQStringList> myGroupingMapper;
- KPopupMenu *myMenu;
+ TDEPopupMenu *myMenu;
TQTimer *myPopupKillTimer;
int myPopupKillTimeout;
bool m_stripWhiteSpace;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 07:53:40 +0000