summaryrefslogtreecommitdiffstats
path: root/klipper
diff options
context:
space:
mode:
Diffstat (limited to 'klipper')
-rw-r--r--klipper/CMakeLists.txt7
-rw-r--r--klipper/applet.cpp10
-rw-r--r--klipper/clipboardpoll.cpp16
-rw-r--r--klipper/configdialog.cpp26
-rw-r--r--klipper/copy-full-path.desktop8
-rw-r--r--klipper/hi128-app-klipper.pngbin5758 -> 6269 bytes
-rw-r--r--klipper/hi16-app-klipper.pngbin803 -> 716 bytes
-rw-r--r--klipper/hi22-app-klipper.pngbin1045 -> 1004 bytes
-rw-r--r--klipper/hi32-app-klipper.pngbin1452 -> 1542 bytes
-rw-r--r--klipper/hi48-app-klipper.pngbin2247 -> 2356 bytes
-rw-r--r--klipper/hi64-app-klipper.pngbin2823 -> 3100 bytes
-rw-r--r--klipper/hisc-app-klipper.svgzbin3091 -> 3750 bytes
-rw-r--r--klipper/history.cpp2
-rw-r--r--klipper/klipperbindings.cpp2
-rw-r--r--klipper/klipperpopup.cpp2
-rw-r--r--klipper/main.cpp14
-rw-r--r--klipper/popupproxy.cpp6
-rw-r--r--klipper/toplevel.cpp78
-rw-r--r--klipper/toplevel.h4
-rw-r--r--klipper/urlgrabber.cpp12
-rw-r--r--klipper/urlgrabber.h2
21 files changed, 102 insertions, 87 deletions
diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt
index 345b05149..84b2f7d68 100644
--- a/klipper/CMakeLists.txt
+++ b/klipper/CMakeLists.txt
@@ -42,6 +42,13 @@ tde_create_translated_desktop(
OUTPUT_NAME klipperrc
PO_DIR klipper-desktops
)
+
+tde_create_translated_desktop(
+ SOURCE copy-full-path.desktop
+ DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus
+ PO_DIR klipper-desktops
+)
+
install( FILES klipperrc.upd klippershortcuts.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
install( PROGRAMS klipper-1-2.pl klipper-trinity1.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
diff --git a/klipper/applet.cpp b/klipper/applet.cpp
index ac47f4d9b..56a57db7b 100644
--- a/klipper/applet.cpp
+++ b/klipper/applet.cpp
@@ -31,7 +31,7 @@
extern "C"
{
- KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+ TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
TDEGlobal::locale()->insertCatalogue("klipper");
int actions = KPanelApplet::Preferences | KPanelApplet::About | KPanelApplet::Help;
@@ -90,7 +90,7 @@ void KlipperApplet::preferences()
void KlipperApplet::help()
{
- kapp->invokeHelp(TQString::null, TQString::fromLatin1("klipper"));
+ tdeApp->invokeHelp(TQString::null, TQString::fromLatin1("klipper"));
}
void KlipperApplet::about()
@@ -114,9 +114,9 @@ void KlipperAppletWidget::init()
TQByteArray arg1, arg2;
TQCString str;
// call() - wait for finishing
- kapp->dcopClient()->call("klipper", "klipper", "quitProcess()", arg1, str, arg2 );
+ tdeApp->dcopClient()->call("klipper", "klipper", "quitProcess()", arg1, str, arg2 );
// register ourselves, so if klipper process is started,
- // it will quit immediately (KUniqueApplication)
+ // it will quit immediately (TDEUniqueApplication)
s_dcop = new DCOPClient;
s_dcop->registerAs( "klipper", false );
}
@@ -129,7 +129,7 @@ KlipperAppletWidget::~KlipperAppletWidget()
DCOPClient* KlipperAppletWidget::s_dcop = 0;
-// this is just to make klipper process think we're KUniqueApplication
+// this is just to make klipper process think we're TDEUniqueApplication
// (AKA ugly hack)
int KlipperAppletWidget::newInstance()
{
diff --git a/klipper/clipboardpoll.cpp b/klipper/clipboardpoll.cpp
index ff6c50cef..852a2ef30 100644
--- a/klipper/clipboardpoll.cpp
+++ b/klipper/clipboardpoll.cpp
@@ -78,7 +78,7 @@ ClipboardPoll::ClipboardPoll( TQWidget* parent )
selection.timestamp_atom = atoms[ 4 ];
clipboard.timestamp_atom = atoms[ 5 ];
bool use_polling = true;
- kapp->installX11EventFilter( this );
+ tdeApp->installX11EventFilter( this );
#ifdef HAVE_XFIXES
int dummy;
if( XFixesQueryExtension( tqt_xdisplay(), &xfixes_event_base, &dummy ))
@@ -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( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged() ), TQ_SLOT(qtSelectionChanged()));
+ connect( tdeApp->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;
@@ -146,7 +146,7 @@ bool ClipboardPoll::x11Event( XEvent* e )
if( xfixes_event_base != -1 && e->type == xfixes_event_base + XFixesSelectionNotify )
{
XFixesSelectionNotifyEvent* ev = reinterpret_cast< XFixesSelectionNotifyEvent* >( e );
- if( ev->selection == XA_PRIMARY && !kapp->clipboard()->ownsSelection())
+ if( ev->selection == XA_PRIMARY && !tdeApp->clipboard()->ownsSelection())
{
#ifdef NOISY_KLIPPER_
kdDebug() << "SELECTION CHANGED (XFIXES)" << endl;
@@ -154,7 +154,7 @@ bool ClipboardPoll::x11Event( XEvent* e )
set_tqt_x_time(ev->timestamp);
emit clipboardChanged( true );
}
- else if( ev->selection == xa_clipboard && !kapp->clipboard()->ownsClipboard())
+ else if( ev->selection == xa_clipboard && !tdeApp->clipboard()->ownsClipboard())
{
#ifdef NOISY_KLIPPER_
kdDebug() << "CLIPBOARD CHANGED (XFIXES)" << endl;
@@ -217,13 +217,13 @@ void ClipboardPoll::updateQtOwnership( SelectionData& data )
void ClipboardPoll::timeout()
{
KlipperWidget::updateTimestamp();
- if( !kapp->clipboard()->ownsSelection() && checkTimestamp( selection ) ) {
+ if( !tdeApp->clipboard()->ownsSelection() && checkTimestamp( selection ) ) {
#ifdef NOISY_KLIPPER_
kdDebug() << "SELECTION CHANGED" << endl;
#endif
emit clipboardChanged( true );
}
- if( !kapp->clipboard()->ownsClipboard() && checkTimestamp( clipboard ) ) {
+ if( !tdeApp->clipboard()->ownsClipboard() && checkTimestamp( clipboard ) ) {
#ifdef NOISY_KLIPPER_
kdDebug() << "CLIPBOARD CHANGED" << endl;
#endif
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/copy-full-path.desktop b/klipper/copy-full-path.desktop
new file mode 100644
index 000000000..32264550a
--- /dev/null
+++ b/klipper/copy-full-path.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+X-TDE-ServiceTypes=all/allfiles,inode/directory
+Actions=CopyFullPath
+
+[Desktop Action CopyFullPath]
+Name=Copy full path
+Icon=edit-copy
+Exec=klipper; dcop klipper klipper setClipboardContents "%U" \ No newline at end of file
diff --git a/klipper/hi128-app-klipper.png b/klipper/hi128-app-klipper.png
index 51dcba6bb..4e04224da 100644
--- a/klipper/hi128-app-klipper.png
+++ b/klipper/hi128-app-klipper.png
Binary files differ
diff --git a/klipper/hi16-app-klipper.png b/klipper/hi16-app-klipper.png
index ea8c2337c..0c1527d00 100644
--- a/klipper/hi16-app-klipper.png
+++ b/klipper/hi16-app-klipper.png
Binary files differ
diff --git a/klipper/hi22-app-klipper.png b/klipper/hi22-app-klipper.png
index a1b8ca89b..9ae7258c5 100644
--- a/klipper/hi22-app-klipper.png
+++ b/klipper/hi22-app-klipper.png
Binary files differ
diff --git a/klipper/hi32-app-klipper.png b/klipper/hi32-app-klipper.png
index cdffa2db6..00ff32727 100644
--- a/klipper/hi32-app-klipper.png
+++ b/klipper/hi32-app-klipper.png
Binary files differ
diff --git a/klipper/hi48-app-klipper.png b/klipper/hi48-app-klipper.png
index aeb46281c..0f8a0d9ac 100644
--- a/klipper/hi48-app-klipper.png
+++ b/klipper/hi48-app-klipper.png
Binary files differ
diff --git a/klipper/hi64-app-klipper.png b/klipper/hi64-app-klipper.png
index 4de252ed9..88aac010f 100644
--- a/klipper/hi64-app-klipper.png
+++ b/klipper/hi64-app-klipper.png
Binary files differ
diff --git a/klipper/hisc-app-klipper.svgz b/klipper/hisc-app-klipper.svgz
index 3f1f30d7d..6dc7f749c 100644
--- a/klipper/hisc-app-klipper.svgz
+++ b/klipper/hisc-app-klipper.svgz
Binary files differ
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/main.cpp b/klipper/main.cpp
index 6d0b5e9e2..8a1057156 100644
--- a/klipper/main.cpp
+++ b/klipper/main.cpp
@@ -24,34 +24,34 @@
#include <tdecmdlineargs.h>
#include <twin.h>
#include <tdeaboutdata.h>
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
#include "toplevel.h"
#include "version.h"
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
#include <qxembed.h> // schroder
#endif
-extern "C" int KDE_EXPORT kdemain(int argc, char *argv[])
+extern "C" int TDE_EXPORT kdemain(int argc, char *argv[])
{
Klipper::createAboutData();
TDECmdLineArgs::init( argc, argv, Klipper::aboutData());
- KUniqueApplication::addCmdLineOptions();
+ TDEUniqueApplication::addCmdLineOptions();
- if (!KUniqueApplication::start()) {
+ if (!TDEUniqueApplication::start()) {
fprintf(stderr, "Klipper is already running!\n");
exit(0);
}
- KUniqueApplication app;
+ TDEUniqueApplication app;
app.disableSessionManagement();
Klipper *toplevel = new Klipper();
// Make Klipper conform to freedesktop system tray standard, see
// http://bugs.kde.org/show_bug.cgi?id=69119
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
QXEmbed::initialize();
#endif
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..c1c5754d6 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -40,8 +40,8 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <ksavefile.h>
-#include <kstandarddirs.h>
-#include <ksimpleconfig.h>
+#include <tdestandarddirs.h>
+#include <tdesimpleconfig.h>
#include <kstringhandler.h>
#include <ksystemtray.h>
#include <kurldrag.h>
@@ -121,7 +121,7 @@ extern bool tqt_qclipboard_bailout_hack;
static void ensureGlobalSyncOff(TDEConfig* config);
-// config == kapp->config for process, otherwise applet
+// config == tdeApp->config for process, otherwise applet
KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
: TQWidget( parent )
, DCOPObject( "klipper" )
@@ -138,12 +138,12 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
updateTimestamp(); // read initial X user time
setBackgroundMode( X11ParentRelative );
- clip = kapp->clipboard();
+ clip = tdeApp->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(tdeApp, 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 );
@@ -235,7 +235,7 @@ KlipperWidget::~KlipperWidget()
delete showTimer;
delete hideTimer;
delete myURLGrabber;
- if( m_config != kapp->config())
+ if( m_config != tdeApp->config())
delete m_config;
tqt_qclipboard_bailout_hack = false;
}
@@ -616,7 +616,7 @@ void KlipperWidget::slotQuit()
return;
config->sync();
- kapp->quit();
+ tdeApp->quit();
}
@@ -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() ) );
}
}
}
@@ -785,7 +785,7 @@ bool KlipperWidget::blockFetchingNewData()
// while the user is doing a selection using the mouse, OOo stops updating the clipboard
// contents, so in practice it's like the user has selected only the part which was
// selected when Klipper asked first.
- ButtonState buttonstate = kapp->keyboardMouseState();
+ ButtonState buttonstate = tdeApp->keyboardMouseState();
if( ( buttonstate & ( ShiftButton | TQt::LeftButton )) == ShiftButton // #85198
|| ( buttonstate & TQt::LeftButton ) == TQt::LeftButton ) { // #80302
m_pendingContentsCheck = true;
@@ -908,7 +908,7 @@ void KlipperWidget::checkClipData( bool selectionMode )
// changing the clipboard at the same time.
bSavedSelectionMode = selectionMode;
bCheckForEmpty = true;
- m_setClipboardTimer.start(100, TRUE);
+ m_setClipboardTimer.start(100, true);
return;
}
@@ -984,7 +984,7 @@ void KlipperWidget::checkClipData( bool selectionMode )
// changing the clipboard at the same time.
bSavedSelectionMode = !selectionMode; // inverted in order to sync
bCheckForEmpty = false;
- m_setClipboardTimer.start(100, TRUE);
+ m_setClipboardTimer.start(100, true);
}
}
@@ -1180,19 +1180,19 @@ TDEAboutData* KlipperWidget::aboutData()
}
Klipper::Klipper( TQWidget* parent )
- : KlipperWidget( parent, kapp->config())
+ : KlipperWidget( parent, tdeApp->config())
{
}
-// this sucks ... KUniqueApplication registers itself as 'klipper'
+// this sucks ... TDEUniqueApplication registers itself as 'klipper'
// for the unique-app detection calls (and it shouldn't use that name IMHO)
-// but in Klipper it's not KUniqueApplication class who handles
+// but in Klipper it's not TDEUniqueApplication class who handles
// the DCOP calls, but an instance of class Klipper, registered as 'klipper'
-// this below avoids a warning when KUniqueApplication wouldn't otherwise
+// this below avoids a warning when TDEUniqueApplication wouldn't otherwise
// find newInstance() (which doesn't do anything in Klipper anyway)
int Klipper::newInstance()
{
- kapp->dcopClient()->setPriorityCall(false); // Allow other dcop calls
+ tdeApp->dcopClient()->setPriorityCall(false); // Allow other dcop calls
return 0;
}
@@ -1200,8 +1200,8 @@ int Klipper::newInstance()
// (AKA ugly hack)
void Klipper::quitProcess()
{
- kapp->dcopClient()->detach();
- kapp->quit();
+ tdeApp->dcopClient()->detach();
+ tdeApp->quit();
}
static void ensureGlobalSyncOff(TDEConfig* config) {
diff --git a/klipper/toplevel.h b/klipper/toplevel.h
index 8a924a46f..3dbd0a069 100644
--- a/klipper/toplevel.h
+++ b/klipper/toplevel.h
@@ -21,7 +21,7 @@
#define _TOPLEVEL_H_
#include <tdeapplication.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
#include <tdepopupmenu.h>
#include <tqmap.h>
#include <tqpixmap.h>
@@ -127,7 +127,7 @@ protected:
bool ignoreClipboardChanges() const;
TDEConfig* config() const { return m_config; }
- bool isApplet() const { return m_config != kapp->config(); }
+ bool isApplet() const { return m_config != tdeApp->config(); }
protected slots:
void slotPopupMenu();
diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
index b8b1cb032..9fd003857 100644
--- a/klipper/urlgrabber.cpp
+++ b/klipper/urlgrabber.cpp
@@ -49,7 +49,7 @@ URLGrabber::URLGrabber( TDEConfig* config )
: m_config( config )
{
if( m_config == NULL )
- m_config = kapp->config();
+ m_config = tdeApp->config();
myMenu = 0L;
myPopupKillTimeout = 8;
m_stripWhiteSpace = true;
@@ -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
{
diff --git a/klipper/urlgrabber.h b/klipper/urlgrabber.h
index cf1c9c784..f83a16816 100644
--- a/klipper/urlgrabber.h
+++ b/klipper/urlgrabber.h
@@ -25,7 +25,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
class TQTimer;
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-14 06:03:55 +0000