summaryrefslogtreecommitdiffstats
path: root/klipper
diff options
context:
space:
mode:
Diffstat (limited to 'klipper')
-rw-r--r--klipper/applet.cpp2
-rw-r--r--klipper/clipboardpoll.cpp14
-rw-r--r--klipper/configdialog.cpp12
-rw-r--r--klipper/configdialog.h8
-rw-r--r--klipper/historyitem.cpp4
-rw-r--r--klipper/popupproxy.cpp2
-rw-r--r--klipper/toplevel.cpp18
-rw-r--r--klipper/urlgrabber.cpp2
-rw-r--r--klipper/urlgrabber.h2
9 files changed, 32 insertions, 32 deletions
diff --git a/klipper/applet.cpp b/klipper/applet.cpp
index 97eee6eec..24b5b6a34 100644
--- a/klipper/applet.cpp
+++ b/klipper/applet.cpp
@@ -91,7 +91,7 @@ void KlipperApplet::preferences()
void KlipperApplet::help()
{
- kapp->invokeHelp(TQString::null, TQString::fromLatin1("klipper"));
+ kapp->invokeHelp(TQString::null, TQString::tqfromLatin1("klipper"));
}
void KlipperApplet::about()
diff --git a/klipper/clipboardpoll.cpp b/klipper/clipboardpoll.cpp
index 7c575ddb0..38ef196e4 100644
--- a/klipper/clipboardpoll.cpp
+++ b/klipper/clipboardpoll.cpp
@@ -23,7 +23,7 @@
#include "clipboardpoll.h"
#include <kapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <kdebug.h>
#include <X11/Xatom.h>
#include <time.h>
@@ -109,8 +109,8 @@ 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( kapp->tqclipboard(), TQT_SIGNAL( selectionChanged() ), TQT_SLOT(qtSelectionChanged()));
+ connect( kapp->tqclipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( qtClipboardChanged() ));
connect( &timer, TQT_SIGNAL( timeout()), TQT_SLOT( timeout()));
timer.start( 1000, false );
selection.atom = XA_PRIMARY;
@@ -147,7 +147,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 && !kapp->tqclipboard()->ownsSelection())
{
#ifdef NOISY_KLIPPER_
kdDebug() << "SELECTION CHANGED (XFIXES)" << endl;
@@ -155,7 +155,7 @@ bool ClipboardPoll::x11Event( XEvent* e )
SET_QT_X_TIME(ev->timestamp);
emit clipboardChanged( true );
}
- else if( ev->selection == xa_clipboard && !kapp->clipboard()->ownsClipboard())
+ else if( ev->selection == xa_clipboard && !kapp->tqclipboard()->ownsClipboard())
{
#ifdef NOISY_KLIPPER_
kdDebug() << "CLIPBOARD CHANGED (XFIXES)" << endl;
@@ -218,13 +218,13 @@ void ClipboardPoll::updateQtOwnership( SelectionData& data )
void ClipboardPoll::timeout()
{
KlipperWidget::updateTimestamp();
- if( !kapp->clipboard()->ownsSelection() && checkTimestamp( selection ) ) {
+ if( !kapp->tqclipboard()->ownsSelection() && checkTimestamp( selection ) ) {
#ifdef NOISY_KLIPPER_
kdDebug() << "SELECTION CHANGED" << endl;
#endif
emit clipboardChanged( true );
}
- if( !kapp->clipboard()->ownsClipboard() && checkTimestamp( clipboard ) ) {
+ if( !kapp->tqclipboard()->ownsClipboard() && checkTimestamp( clipboard ) ) {
#ifdef NOISY_KLIPPER_
kdDebug() << "CLIPBOARD CHANGED" << endl;
#endif
diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp
index 317305e75..ea1fb0974 100644
--- a/klipper/configdialog.cpp
+++ b/klipper/configdialog.cpp
@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlistview.h>
#include <tqpushbutton.h>
#include <tqtooltip.h>
@@ -66,7 +66,7 @@ void ConfigDialog::show()
{
if ( !isVisible() ) {
KWinModule module(0, KWinModule::INFO_DESKTOP);
- TQSize s1 = sizeHint();
+ TQSize s1 = tqsizeHint();
TQSize s2 = module.workArea().size();
int w = s1.width();
int h = s1.height();
@@ -299,13 +299,13 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget,
connect( delActionButton, TQT_SIGNAL( clicked() ), TQT_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 );
+ label->tqsetAlignment( WordBreak | AlignLeft | AlignVCenter );
box->setStretchFactor( label, 5 );
box = new TQHBox( this );
TQPushButton *advanced = new TQPushButton( i18n("Advanced..."), box );
- advanced->setFixedSize( advanced->sizeHint() );
+ advanced->setFixedSize( advanced->tqsizeHint() );
connect( advanced, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdvanced() ));
(void) new TQWidget( box ); // spacer
@@ -410,8 +410,8 @@ void ActionWidget::slotAdvanced()
AdvancedWidget *widget = new AdvancedWidget( box );
widget->setWMClasses( m_wmClasses );
- dlg.resize( dlg.sizeHint().width(),
- dlg.sizeHint().height() +40); // or we get an ugly scrollbar :(
+ dlg.resize( dlg.tqsizeHint().width(),
+ dlg.tqsizeHint().height() +40); // or we get an ugly scrollbar :(
if ( dlg.exec() == TQDialog::Accepted ) {
m_wmClasses = widget->wmClasses();
diff --git a/klipper/configdialog.h b/klipper/configdialog.h
index 514f40bc7..219f5f6cf 100644
--- a/klipper/configdialog.h
+++ b/klipper/configdialog.h
@@ -237,11 +237,11 @@ public:
ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name )
: KListView( parent, name ), _configWidget( configWidget ),
_regExpEditor(0L) {}
- // TQListView has a weird idea of a sizeHint...
- virtual TQSize sizeHint () const {
- int w = minimumSizeHint().width();
+ // TQListView has a weird idea of a tqsizeHint...
+ virtual TQSize tqsizeHint () const {
+ int w = tqminimumSizeHint().width();
int h = header()->height();
- h += viewport()->sizeHint().height();
+ h += viewport()->tqsizeHint().height();
h += horizontalScrollBar()->height();
TQListViewItem *item = firstChild();
diff --git a/klipper/historyitem.cpp b/klipper/historyitem.cpp
index 481339b30..3dfc37f17 100644
--- a/klipper/historyitem.cpp
+++ b/klipper/historyitem.cpp
@@ -52,8 +52,8 @@ HistoryItem* HistoryItem::create( const TQMimeSource& aSource )
TQMap<TQString,TQString> metaData;
if( KURLDrag::decode( &aSource, urls, metaData )) {
// this is from KonqDrag (libkonq)
- TQByteArray a = aSource.encodedData( "application/x-kde-cutselection" );
- bool cut = !a.isEmpty() && (a.at(0) == '1'); // true if 1
+ TQByteArray a = aSource.tqencodedData( "application/x-kde-cutselection" );
+ bool cut = !a.isEmpty() && (a.tqat(0) == '1'); // true if 1
return new HistoryURLItem( urls, metaData, cut );
}
}
diff --git a/klipper/popupproxy.cpp b/klipper/popupproxy.cpp
index 838888bb9..cff763ff6 100644
--- a/klipper/popupproxy.cpp
+++ b/klipper/popupproxy.cpp
@@ -133,7 +133,7 @@ int PopupProxy::insertFromSpill( int index ) {
// discarding any that doesn't match the current filter.
// stop when the total number of items equal m_itemsPerMenu;
int count = 0;
- int remainingHeight = m_menu_height - proxy_for_menu->sizeHint().height();
+ int remainingHeight = m_menu_height - proxy_for_menu->tqsizeHint().height();
// Force at least one item to be inserted.
remainingHeight = QMAX( remainingHeight, 0 );
for ( const HistoryItem* item = spillPointer.current();
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index b0ccdf859..81c7bd326 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -21,7 +21,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqcursor.h>
#include <tqdatetime.h>
#include <tqfile.h>
@@ -142,7 +142,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, KConfig* config )
updateTimestamp(); // read initial X user time
setBackgroundMode( X11ParentRelative );
- clip = kapp->clipboard();
+ clip = kapp->tqclipboard();
connect( &m_overflowClearTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotClearOverflow()));
m_overflowClearTimer.start( 1000 );
@@ -327,7 +327,7 @@ void KlipperWidget::showPopupMenu( TQPopupMenu *menu )
{
Q_ASSERT( menu != 0L );
- TQSize size = menu->sizeHint(); // geometry is not valid until it's shown
+ TQSize size = menu->tqsizeHint(); // geometry is not valid until it's shown
if (bPopupAtMouse) {
TQPoint g = TQCursor::pos();
if ( size.height() < g.y() )
@@ -1013,13 +1013,13 @@ TQString KlipperWidget::getClipboardHistoryItem(int i)
//
bool KlipperWidget::ignoreClipboardChanges() const
{
- TQWidget *focusWidget = tqApp->focusWidget();
- if ( focusWidget )
+ TQWidget *tqfocusWidget = tqApp->tqfocusWidget();
+ if ( tqfocusWidget )
{
- if ( focusWidget->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ||
- (focusWidget->parentWidget() &&
- focusWidget->inherits(TQLINEEDIT_OBJECT_NAME_STRING) &&
- focusWidget->parentWidget()->inherits(TQSPINWIDGET_OBJECT_NAME_STRING)) )
+ if ( tqfocusWidget->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ||
+ (tqfocusWidget->parentWidget() &&
+ tqfocusWidget->inherits(TQLINEEDIT_OBJECT_NAME_STRING) &&
+ tqfocusWidget->parentWidget()->inherits(TQSPINWIDGET_OBJECT_NAME_STRING)) )
{
return true;
}
diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
index c814508c1..de6561fe3 100644
--- a/klipper/urlgrabber.cpp
+++ b/klipper/urlgrabber.cpp
@@ -379,7 +379,7 @@ void URLGrabber::slotKillPopupMenu()
{
if ( myMenu && myMenu->isVisible() )
{
- if ( myMenu->geometry().contains( TQCursor::pos() ) &&
+ if ( myMenu->tqgeometry().contains( TQCursor::pos() ) &&
myPopupKillTimeout > 0 )
{
myPopupKillTimer->start( 1000 * myPopupKillTimeout, true );
diff --git a/klipper/urlgrabber.h b/klipper/urlgrabber.h
index b5212890b..40d288b9a 100644
--- a/klipper/urlgrabber.h
+++ b/klipper/urlgrabber.h
@@ -132,7 +132,7 @@ public:
inline bool matches( const TQString& string ) {
int res = myRegExp.search( string ) ;
if ( res != -1 ) {
- myCapturedTexts = myRegExp.capturedTexts();
+ myCapturedTexts = myRegExp.tqcapturedTexts();
return true;
}
return false;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-16 13:34:00 +0000