summaryrefslogtreecommitdiffstats
path: root/klipper
diff options
context:
space:
mode:
Diffstat (limited to 'klipper')
-rw-r--r--klipper/applet.cpp2
-rw-r--r--klipper/configdialog.cpp12
-rw-r--r--klipper/configdialog.h8
-rw-r--r--klipper/historyitem.cpp2
-rw-r--r--klipper/historyurlitem.cpp2
-rw-r--r--klipper/klipperpopup.cpp2
-rw-r--r--klipper/klipperrc.desktop24
-rw-r--r--klipper/popupproxy.cpp4
-rw-r--r--klipper/toplevel.cpp20
-rw-r--r--klipper/urlgrabber.cpp2
10 files changed, 39 insertions, 39 deletions
diff --git a/klipper/applet.cpp b/klipper/applet.cpp
index 24b5b6a34..97eee6eec 100644
--- a/klipper/applet.cpp
+++ b/klipper/applet.cpp
@@ -91,7 +91,7 @@ void KlipperApplet::preferences()
void KlipperApplet::help()
{
- kapp->invokeHelp(TQString::null, TQString::tqfromLatin1("klipper"));
+ kapp->invokeHelp(TQString::null, TQString::fromLatin1("klipper"));
}
void KlipperApplet::about()
diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp
index 500b22088..3f325d40e 100644
--- a/klipper/configdialog.cpp
+++ b/klipper/configdialog.cpp
@@ -66,7 +66,7 @@ void ConfigDialog::show()
{
if ( !isVisible() ) {
KWinModule module(0, KWinModule::INFO_DESKTOP);
- TQSize s1 = tqsizeHint();
+ TQSize s1 = sizeHint();
TQSize s2 = module.workArea().size();
int w = s1.width();
int h = s1.height();
@@ -298,14 +298,14 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget,
delActionButton = new TQPushButton( i18n("&Delete Action"), box );
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 tqreplaced with the clipboard contents."), box);
- label->tqsetAlignment( WordBreak | AlignLeft | AlignVCenter );
+ 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 );
box->setStretchFactor( label, 5 );
box = new TQHBox( this );
TQPushButton *advanced = new TQPushButton( i18n("Advanced..."), box );
- advanced->setFixedSize( advanced->tqsizeHint() );
+ advanced->setFixedSize( advanced->sizeHint() );
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.tqsizeHint().width(),
- dlg.tqsizeHint().height() +40); // or we get an ugly scrollbar :(
+ dlg.resize( dlg.sizeHint().width(),
+ dlg.sizeHint().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 9012719d0..b7aa26659 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 tqsizeHint...
- virtual TQSize tqsizeHint () const {
- int w = tqminimumSizeHint().width();
+ // TQListView has a weird idea of a sizeHint...
+ virtual TQSize sizeHint () const {
+ int w = minimumSizeHint().width();
int h = header()->height();
- h += viewport()->tqsizeHint().height();
+ h += viewport()->sizeHint().height();
h += horizontalScrollBar()->height();
TQListViewItem *item = firstChild();
diff --git a/klipper/historyitem.cpp b/klipper/historyitem.cpp
index b217bdb31..481339b30 100644
--- a/klipper/historyitem.cpp
+++ b/klipper/historyitem.cpp
@@ -52,7 +52,7 @@ HistoryItem* HistoryItem::create( const TQMimeSource& aSource )
TQMap<TQString,TQString> metaData;
if( KURLDrag::decode( &aSource, urls, metaData )) {
// this is from KonqDrag (libkonq)
- TQByteArray a = aSource.tqencodedData( "application/x-kde-cutselection" );
+ TQByteArray a = aSource.encodedData( "application/x-kde-cutselection" );
bool cut = !a.isEmpty() && (a.at(0) == '1'); // true if 1
return new HistoryURLItem( urls, metaData, cut );
}
diff --git a/klipper/historyurlitem.cpp b/klipper/historyurlitem.cpp
index 18fd72536..863a93fb8 100644
--- a/klipper/historyurlitem.cpp
+++ b/klipper/historyurlitem.cpp
@@ -56,7 +56,7 @@ bool HistoryURLItem::operator==( const HistoryItem& rhs) const
if ( const HistoryURLItem* casted_rhs = dynamic_cast<const HistoryURLItem*>( &rhs ) ) {
return casted_rhs->urls == urls
&& casted_rhs->metaData.count() == metaData.count()
- && tqEqual( casted_rhs->metaData.begin(), casted_rhs->metaData.end(), metaData.begin())
+ && qEqual( casted_rhs->metaData.begin(), casted_rhs->metaData.end(), metaData.begin())
&& casted_rhs->cut == cut;
}
return false;
diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp
index f5a96cd87..954768fc5 100644
--- a/klipper/klipperpopup.cpp
+++ b/klipper/klipperpopup.cpp
@@ -106,7 +106,7 @@ KlipperPopup::KlipperPopup( History* history, TQWidget* parent, const char* name
n_history_items( 0 )
{
KWin::WindowInfo i = KWin::windowInfo( winId(), NET::WMGeometry );
- TQRect g = i.tqgeometry();
+ TQRect g = i.geometry();
TQRect screen = KGlobalSettings::desktopGeometry(g.center());
int menu_height = ( screen.height() ) * 3/4;
int menu_width = ( screen.width() ) * 1/3;
diff --git a/klipper/klipperrc.desktop b/klipper/klipperrc.desktop
index 57aa4043c..5ad72c141 100644
--- a/klipper/klipperrc.desktop
+++ b/klipper/klipperrc.desktop
@@ -243,7 +243,7 @@ Description[bn]=কনকরার দিয়ে খোলো (&ক)
Description[br]=Digeriñ gant &Konqueror
Description[bs]=Otvori u &Konqueroru
Description[ca]=Obre amb el &Konqueror
-Description[cs]=Otevřít potqmocí &Konqueroru
+Description[cs]=Otevřít pomocí &Konqueroru
Description[csb]=Òtemknij w &Konquerorze
Description[cy]=Agor gyda &Konqueror
Description[da]=Åbn med &Konqueror
@@ -292,7 +292,7 @@ Description[ro]=Deschide cu &Konqueror
Description[ru]=Открыть в &Konqueror
Description[rw]=Gufungura ukoresheje Konqueror
Description[se]=Raba &Konquerorain
-Description[sk]=Otvoriť potqmocou &Konqueror
+Description[sk]=Otvoriť pomocou &Konqueror
Description[sl]=Odpri s &Konquerorjem
Description[sr]=Отвори помоћу &Konqueror-а
Description[sr@Latn]=Otvori pomoću &Konqueror-a
@@ -328,7 +328,7 @@ Description[bn]=মোজিলা দিয়ে খোলো (&ম)
Description[br]=Digeriñ gant &Mozilla
Description[bs]=Otvori u &Mozilla
Description[ca]=Obre amb el &Mozilla
-Description[cs]=Otevřít potqmocí &Mozilla
+Description[cs]=Otevřít pomocí &Mozilla
Description[csb]=Òtemknij w &Mozillë
Description[cy]=Agor gyda &Mozilla
Description[da]=Åbn med &Mozilla
@@ -377,7 +377,7 @@ Description[ro]=Deschide cu &Mozilla
Description[ru]=Открыть в &Mozilla
Description[rw]=Gufungura ukoresheje Mozilla
Description[se]=Raba &Mozillain
-Description[sk]=Otvoriť potqmocou &Mozilla
+Description[sk]=Otvoriť pomocou &Mozilla
Description[sl]=Odpri z &Mozillo
Description[sr]=Отвори помоћу &Mozilla-е
Description[sr@Latn]=Otvori pomoću &Mozilla-e
@@ -492,7 +492,7 @@ Description[bn]=ফায়ার&ফক্স দিয়ে খোলো
Description[br]=Digeriñ gant &Firefox
Description[bs]=Otvori u &Firefoxu
Description[ca]=Obre amb el &Firefox
-Description[cs]=Otevřít potqmocí &Firefox
+Description[cs]=Otevřít pomocí &Firefox
Description[csb]=Òtemknij w &Firefokse
Description[da]=Åbn med &Firefox
Description[de]=Mit &Firefox öffnen
@@ -531,7 +531,7 @@ Description[pt_BR]=Abrir com o &Firefox
Description[ro]=Deschide cu &Firefox
Description[ru]=Открыть в &Firefox
Description[se]=Raba &Firefox:ain
-Description[sk]=Otvoriť potqmocou &Firefox
+Description[sk]=Otvoriť pomocou &Firefox
Description[sl]=Odpri s &Firefox
Description[sr]=Отвори помоћу &Firefox-а
Description[sr@Latn]=Otvori pomoću &Firefox-a
@@ -1655,7 +1655,7 @@ Description[bn]=কনকরার দিয়ে খোলো (&ক)
Description[br]=Digeriñ gant &Konqueror
Description[bs]=Otvori u &Konqueroru
Description[ca]=Obre amb el &Konqueror
-Description[cs]=Otevřít potqmocí &Konqueroru
+Description[cs]=Otevřít pomocí &Konqueroru
Description[csb]=Òtemknij w &Konquerorze
Description[cy]=Agor gyda &Konqueror
Description[da]=Åbn med &Konqueror
@@ -1704,7 +1704,7 @@ Description[ro]=Deschide cu &Konqueror
Description[ru]=Открыть в &Konqueror
Description[rw]=Gufungura ukoresheje Konqueror
Description[se]=Raba &Konquerorain
-Description[sk]=Otvoriť potqmocou &Konqueror
+Description[sk]=Otvoriť pomocou &Konqueror
Description[sl]=Odpri s &Konquerorjem
Description[sr]=Отвори помоћу &Konqueror-а
Description[sr@Latn]=Otvori pomoću &Konqueror-a
@@ -1739,7 +1739,7 @@ Description[bn]=নেটস্কেপ দিয়ে খোলো (&ন)
Description[br]=Digeriñ gant &Netscape
Description[bs]=Otvori u &Netscape
Description[ca]=Obre amb el &Netscape
-Description[cs]=Otevřít potqmocí &Netscape
+Description[cs]=Otevřít pomocí &Netscape
Description[csb]=Òtemknij w &Netscape
Description[cy]=Agor gyda &Netscape
Description[da]=Åbn med &Netscape
@@ -1788,7 +1788,7 @@ Description[ro]=Deschide cu &Netscape
Description[ru]=Открыть в &Netscape
Description[rw]=Gufungura ukoresheje Netscape
Description[se]=Raba &Netscapeain
-Description[sk]=Otvoriť potqmocou &Netscape
+Description[sk]=Otvoriť pomocou &Netscape
Description[sl]=Odpri z &Netscape
Description[sr]=Отвори помоћу &Netscape-а
Description[sr@Latn]=Otvori pomoću &Netscape-a
@@ -1823,7 +1823,7 @@ Description[bn]=মোজিলা দিয়ে খোলো (&ম)
Description[br]=Digeriñ gant &Mozilla
Description[bs]=Otvori u &Mozilla
Description[ca]=Obre amb el &Mozilla
-Description[cs]=Otevřít potqmocí &Mozilla
+Description[cs]=Otevřít pomocí &Mozilla
Description[csb]=Òtemknij w &Mozillë
Description[cy]=Agor gyda &Mozilla
Description[da]=Åbn med &Mozilla
@@ -1872,7 +1872,7 @@ Description[ro]=Deschide cu &Mozilla
Description[ru]=Открыть в &Mozilla
Description[rw]=Gufungura ukoresheje Mozilla
Description[se]=Raba &Mozillain
-Description[sk]=Otvoriť potqmocou &Mozilla
+Description[sk]=Otvoriť pomocou &Mozilla
Description[sl]=Odpri z &Mozillo
Description[sr]=Отвори помоћу &Mozilla-е
Description[sr@Latn]=Otvori pomoću &Mozilla-e
diff --git a/klipper/popupproxy.cpp b/klipper/popupproxy.cpp
index 6c70a279a..196a4259c 100644
--- a/klipper/popupproxy.cpp
+++ b/klipper/popupproxy.cpp
@@ -94,7 +94,7 @@ void PopupProxy::tryInsertItem( HistoryItem const * const item,
// Squeeze text strings so that do not take up the entire screen (or more)
TQString text( KStringHandler::cPixelSqueeze(item->text().simplifyWhiteSpace(),
proxy_for_menu->fontMetrics(),
- m_menu_width).tqreplace( "&", "&&" ) );
+ m_menu_width).replace( "&", "&&" ) );
id = proxy_for_menu->insertItem( text, -1, index );
} else {
const TQSize max_size( m_menu_width,m_menu_height/4 );
@@ -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->tqsizeHint().height();
+ int remainingHeight = m_menu_height - proxy_for_menu->sizeHint().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 15267d3d8..8b2bcb0eb 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -327,7 +327,7 @@ void KlipperWidget::showPopupMenu( TQPopupMenu *menu )
{
Q_ASSERT( menu != 0L );
- TQSize size = menu->tqsizeHint(); // tqgeometry is not valid until it's shown
+ TQSize size = menu->sizeHint(); // geometry is not valid until it's shown
if (bPopupAtMouse) {
TQPoint g = TQCursor::pos();
if ( size.height() < g.y() )
@@ -336,7 +336,7 @@ void KlipperWidget::showPopupMenu( TQPopupMenu *menu )
menu->popup(TQPoint(g.x(), g.y()));
} else {
KWin::WindowInfo i = KWin::windowInfo( winId(), NET::WMGeometry );
- TQRect g = i.tqgeometry();
+ TQRect g = i.geometry();
TQRect screen = KGlobalSettings::desktopGeometry(g.center());
if ( g.x()-screen.x() > screen.width()/2 &&
@@ -380,7 +380,7 @@ bool KlipperWidget::loadHistory() {
TQDataStream* history_stream = &file_stream;
TQByteArray data;
if( !oldfile ) {
- TQ_UINT32 crc;
+ Q_UINT32 crc;
file_stream >> crc >> data;
if( crc32( 0, reinterpret_cast<unsigned char *>( data.data() ), data.size() ) != crc ) {
kdWarning() << failed_load_warning << ": " << history_file.errorString() << endl;
@@ -444,7 +444,7 @@ void KlipperWidget::saveHistory() {
for ( const HistoryItem* item = history()->first(); item; item = history()->next() ) {
history_stream << item;
}
- TQ_UINT32 crc = crc32( 0, reinterpret_cast<unsigned char *>( data.data() ), data.size() );
+ Q_UINT32 crc = crc32( 0, reinterpret_cast<unsigned char *>( data.data() ), data.size() );
*history_file.dataStream() << crc << data;
}
@@ -1013,13 +1013,13 @@ TQString KlipperWidget::getClipboardHistoryItem(int i)
//
bool KlipperWidget::ignoreClipboardChanges() const
{
- TQWidget *tqfocusWidget = tqApp->tqfocusWidget();
- if ( tqfocusWidget )
+ TQWidget *focusWidget = qApp->focusWidget();
+ if ( focusWidget )
{
- if ( tqfocusWidget->inherits( "QSpinBox" ) ||
- (tqfocusWidget->tqparentWidget() &&
- tqfocusWidget->inherits("QLineEdit") &&
- tqfocusWidget->tqparentWidget()->inherits("QSpinWidget")) )
+ if ( focusWidget->inherits( "QSpinBox" ) ||
+ (focusWidget->parentWidget() &&
+ focusWidget->inherits("QLineEdit") &&
+ focusWidget->parentWidget()->inherits("QSpinWidget")) )
{
return true;
}
diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
index d13c651d7..c814508c1 100644
--- a/klipper/urlgrabber.cpp
+++ b/klipper/urlgrabber.cpp
@@ -379,7 +379,7 @@ void URLGrabber::slotKillPopupMenu()
{
if ( myMenu && myMenu->isVisible() )
{
- if ( myMenu->tqgeometry().tqcontains( TQCursor::pos() ) &&
+ if ( myMenu->geometry().contains( TQCursor::pos() ) &&
myPopupKillTimeout > 0 )
{
myPopupKillTimer->start( 1000 * myPopupKillTimeout, true );
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 21:16:45 +0000