summaryrefslogtreecommitdiffstats
path: root/klipper
diff options
context:
space:
mode:
Diffstat (limited to 'klipper')
-rw-r--r--klipper/applet.cpp4
-rw-r--r--klipper/clipboardpoll.cpp14
-rw-r--r--klipper/toplevel.cpp20
-rw-r--r--klipper/toplevel.h2
-rw-r--r--klipper/urlgrabber.cpp2
5 files changed, 21 insertions, 21 deletions
diff --git a/klipper/applet.cpp b/klipper/applet.cpp
index bd8e28317..56a57db7b 100644
--- a/klipper/applet.cpp
+++ b/klipper/applet.cpp
@@ -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,7 +114,7 @@ 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 (TDEUniqueApplication)
s_dcop = new DCOPClient;
diff --git a/klipper/clipboardpoll.cpp b/klipper/clipboardpoll.cpp
index a2f5368a8..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,8 +108,8 @@ ClipboardPoll::ClipboardPoll( TQWidget* parent )
void ClipboardPoll::initPolling()
{
- connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged() ), TQ_SLOT(qtSelectionChanged()));
- connect( kapp->clipboard(), TQ_SIGNAL( dataChanged() ), TQ_SLOT( qtClipboardChanged() ));
+ 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;
@@ -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/toplevel.cpp b/klipper/toplevel.cpp
index 473b3ff53..aaabcc0ff 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -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,7 +138,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
updateTimestamp(); // read initial X user time
setBackgroundMode( X11ParentRelative );
- clip = kapp->clipboard();
+ clip = tdeApp->clipboard();
connect( &m_overflowClearTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotClearOverflow()));
m_overflowClearTimer.start( 1000 );
@@ -187,7 +187,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
showTimer = new TQTime();
readProperties(m_config);
- connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
+ connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
poll = new ClipboardPoll( this );
connect( poll, TQ_SIGNAL( clipboardChanged( bool ) ),
@@ -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();
}
@@ -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;
@@ -1180,7 +1180,7 @@ TDEAboutData* KlipperWidget::aboutData()
}
Klipper::Klipper( TQWidget* parent )
- : KlipperWidget( parent, kapp->config())
+ : KlipperWidget( parent, tdeApp->config())
{
}
@@ -1192,7 +1192,7 @@ Klipper::Klipper( TQWidget* parent )
// 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..fa0c103b3 100644
--- a/klipper/toplevel.h
+++ b/klipper/toplevel.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 078e38097..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;
generated by cgit v1.2.1 (git 2.18.0) at 2025-02-13 02:53:57 +0000