summaryrefslogtreecommitdiffstats
path: root/kicker/kicker/buttons
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/kicker/buttons')
-rw-r--r--kicker/kicker/buttons/bookmarksbutton.h2
-rw-r--r--kicker/kicker/buttons/browserbutton.cpp2
-rw-r--r--kicker/kicker/buttons/browserbutton.h2
-rw-r--r--kicker/kicker/buttons/desktopbutton.cpp2
-rw-r--r--kicker/kicker/buttons/kbutton.h2
-rw-r--r--kicker/kicker/buttons/knewbutton.cpp16
-rw-r--r--kicker/kicker/buttons/knewbutton.h4
-rw-r--r--kicker/kicker/buttons/nonkdeappbutton.cpp2
-rw-r--r--kicker/kicker/buttons/nonkdeappbutton.h2
-rw-r--r--kicker/kicker/buttons/servicemenubutton.h2
-rw-r--r--kicker/kicker/buttons/windowlistbutton.h2
11 files changed, 19 insertions, 19 deletions
diff --git a/kicker/kicker/buttons/bookmarksbutton.h b/kicker/kicker/buttons/bookmarksbutton.h
index d150688f0..3d8518519 100644
--- a/kicker/kicker/buttons/bookmarksbutton.h
+++ b/kicker/kicker/buttons/bookmarksbutton.h
@@ -32,7 +32,7 @@ class KActionCollection;
class KBookmarkOwner;
/**
- * Button that tqcontains a bookmark menu
+ * Button that contains a bookmark menu
*/
class BookmarksButton : public PanelPopupButton
{
diff --git a/kicker/kicker/buttons/browserbutton.cpp b/kicker/kicker/buttons/browserbutton.cpp
index 4a8c9a7af..2e2cb5a2d 100644
--- a/kicker/kicker/buttons/browserbutton.cpp
+++ b/kicker/kicker/buttons/browserbutton.cpp
@@ -103,7 +103,7 @@ void BrowserButton::dropEvent( TQDropEvent *ev )
{
KURL path ( topMenu->path() );
_menuTimer->stop();
- KFileItem item( path, TQString::tqfromLatin1( "inode/directory" ), KFileItem::Unknown );
+ KFileItem item( path, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown );
KonqOperations::doDrop( &item, path, ev, this );
PanelButton::dropEvent(ev);
}
diff --git a/kicker/kicker/buttons/browserbutton.h b/kicker/kicker/buttons/browserbutton.h
index cd64b3539..bb08801d9 100644
--- a/kicker/kicker/buttons/browserbutton.h
+++ b/kicker/kicker/buttons/browserbutton.h
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
class PanelBrowserMenu;
/**
- * Button that tqcontains a Browser directory menu
+ * Button that contains a Browser directory menu
*/
class BrowserButton : public PanelPopupButton
{
diff --git a/kicker/kicker/buttons/desktopbutton.cpp b/kicker/kicker/buttons/desktopbutton.cpp
index 71bcaa2e5..9f23741e5 100644
--- a/kicker/kicker/buttons/desktopbutton.cpp
+++ b/kicker/kicker/buttons/desktopbutton.cpp
@@ -77,7 +77,7 @@ void DesktopButton::dragEnterEvent( TQDragEnterEvent *ev )
void DesktopButton::dropEvent( TQDropEvent *ev )
{
KURL dPath ( KGlobalSettings::desktopPath() );
- KFileItem item( dPath, TQString::tqfromLatin1( "inode/directory" ), KFileItem::Unknown );
+ KFileItem item( dPath, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown );
KonqOperations::doDrop( &item, dPath, ev, this );
PanelButton::dropEvent(ev);
}
diff --git a/kicker/kicker/buttons/kbutton.h b/kicker/kicker/buttons/kbutton.h
index 469b0fab5..bf98e74f8 100644
--- a/kicker/kicker/buttons/kbutton.h
+++ b/kicker/kicker/buttons/kbutton.h
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "panelbutton.h"
/**
- * Button that tqcontains the PanelKMenu and client menu manager.
+ * Button that contains the PanelKMenu and client menu manager.
*/
class KButton : public PanelPopupButton
{
diff --git a/kicker/kicker/buttons/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp
index a395b3cb6..9c9f438ac 100644
--- a/kicker/kicker/buttons/knewbutton.cpp
+++ b/kicker/kicker/buttons/knewbutton.cpp
@@ -70,7 +70,7 @@ KNewButton::KNewButton( TQWidget* parent )
m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_basic.mng"));
m_movie->connectUpdate(this, TQT_SLOT(updateMovie()));
- m_movie->connecttqStatus(this, TQT_SLOT(slottqStatus(int)));
+ m_movie->connectStatus(this, TQT_SLOT(slotStatus(int)));
m_movie->connectResize(this, TQT_SLOT(slotSetSize(const TQSize&)));
TQApplication::desktop()->screen()->installEventFilter(this);
@@ -85,7 +85,7 @@ KNewButton::~KNewButton()
delete m_movie;
}
-void KNewButton::slottqStatus(int status)
+void KNewButton::slotStatus(int status)
{
if(status == TQMovie::EndOfLoop)
slotStopAnimation();
@@ -99,7 +99,7 @@ TQColor KNewButton::borderColor() const
QRgb rgb = img.pixel(orientation() == Qt::Horizontal ? img.width() - i - 1 :
i, 2);
- if (tqGreen(rgb) > 0x50)
+ if (qGreen(rgb) > 0x50)
return rgb;
}
@@ -151,7 +151,7 @@ void KNewButton::setPopupDirection(KPanelApplet::Direction d)
}
m_movie->connectUpdate(this, TQT_SLOT(updateMovie()));
- m_movie->connecttqStatus(this, TQT_SLOT(slottqStatus(int)));
+ m_movie->connectStatus(this, TQT_SLOT(slotStatus(int)));
m_movie->connectResize(this, TQT_SLOT(slotSetSize(const TQSize&)));
}
@@ -215,7 +215,7 @@ bool KNewButton::eventFilter(TQObject *o, TQEvent *e)
e->type() == TQEvent::MouseButtonDblClick )
{
TQMouseEvent *me = static_cast<TQMouseEvent *>(e);
- if (rect().tqcontains(mapFromGlobal(me->globalPos())))
+ if (rect().contains(mapFromGlobal(me->globalPos())))
{
if (m_pressedDuringPopup && m_popup && m_openTimer != -1
&& (me->button() & Qt::LeftButton) )
@@ -286,7 +286,7 @@ void KNewButton::drawEye()
}
m_active_pixmap = pixmap.xForm(matrix);
- tqrepaint(false);
+ repaint(false);
}
#undef eye_x
#undef eye_y
@@ -355,9 +355,9 @@ void KNewButton::mouseMoveEvent(TQMouseEvent* e)
{
KButton::mouseMoveEvent(e);
- m_mouseInside = m_sloppyRegion.tqcontains(e->pos());
+ m_mouseInside = m_sloppyRegion.contains(e->pos());
- if ( m_sloppyRegion.tqcontains(e->pos()))
+ if ( m_sloppyRegion.contains(e->pos()))
{
if (m_hoverTimer == -1 && KickerSettings::openOnHover())
m_hoverTimer = startTimer(kMax(200,TQApplication::doubleClickInterval()/2));
diff --git a/kicker/kicker/buttons/knewbutton.h b/kicker/kicker/buttons/knewbutton.h
index 8be1a8600..bcb8b8743 100644
--- a/kicker/kicker/buttons/knewbutton.h
+++ b/kicker/kicker/buttons/knewbutton.h
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqpoint.h>
/**
- * Button that tqcontains the PanelKMenu and client menu manager.
+ * Button that contains the PanelKMenu and client menu manager.
*/
class KNewButton : public KButton
{
@@ -57,7 +57,7 @@ public:
virtual void setPopupDirection(KPanelApplet::Direction d);
private slots:
- void slottqStatus(int);
+ void slotStatus(int);
void slotSetSize(const TQSize&);
void slotStopAnimation();
void rewindMovie();
diff --git a/kicker/kicker/buttons/nonkdeappbutton.cpp b/kicker/kicker/buttons/nonkdeappbutton.cpp
index e91a06f37..29b7ddb2e 100644
--- a/kicker/kicker/buttons/nonkdeappbutton.cpp
+++ b/kicker/kicker/buttons/nonkdeappbutton.cpp
@@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// our own definition
#include "nonkdeappbutton.h"
-// we include the "tqmoc" file so that the KDE build system knows to create it
+// we include the "moc" file so that the KDE build system knows to create it
#include "nonkdeappbutton.moc"
// this is one of the two constructors. gets called when creating a new button
diff --git a/kicker/kicker/buttons/nonkdeappbutton.h b/kicker/kicker/buttons/nonkdeappbutton.h
index 44cbb2f0d..217f2c22c 100644
--- a/kicker/kicker/buttons/nonkdeappbutton.h
+++ b/kicker/kicker/buttons/nonkdeappbutton.h
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
class PanelExeDialog;
/**
- * Button that tqcontains a non-KDE application
+ * Button that contains a non-KDE application
* subclass of PanelButton
*/
class NonKDEAppButton : public PanelButton
diff --git a/kicker/kicker/buttons/servicemenubutton.h b/kicker/kicker/buttons/servicemenubutton.h
index dda61dab6..0bd05b8ee 100644
--- a/kicker/kicker/buttons/servicemenubutton.h
+++ b/kicker/kicker/buttons/servicemenubutton.h
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
class PanelServiceMenu;
/**
- * Button that tqcontains a Service menu
+ * Button that contains a Service menu
*/
class ServiceMenuButton : public PanelPopupButton
{
diff --git a/kicker/kicker/buttons/windowlistbutton.h b/kicker/kicker/buttons/windowlistbutton.h
index 19032083b..d8b57c62e 100644
--- a/kicker/kicker/buttons/windowlistbutton.h
+++ b/kicker/kicker/buttons/windowlistbutton.h
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
class KWindowListMenu;
/**
- * Button that tqcontains a windowlist menu
+ * Button that contains a windowlist menu
*/
class WindowListButton : public PanelPopupButton
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 07:53:06 +0000