diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
commit | 625904bd3097f9749450428904ca14ff2531824d (patch) | |
tree | a45c43d5de71cb720078fa1272a4339815a919be /superkaramba/src | |
parent | 6335dc55802871b5a43492f217b6edbb420204c4 (diff) | |
download | tdeutils-625904bd3097f9749450428904ca14ff2531824d.tar.gz tdeutils-625904bd3097f9749450428904ca14ff2531824d.zip |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'superkaramba/src')
-rw-r--r-- | superkaramba/src/datesensor.cpp | 4 | ||||
-rw-r--r-- | superkaramba/src/karamba.cpp | 10 | ||||
-rw-r--r-- | superkaramba/src/karamba.h | 4 | ||||
-rw-r--r-- | superkaramba/src/karamba_python.cpp | 2 | ||||
-rw-r--r-- | superkaramba/src/kwidgetlistbox.cpp | 4 | ||||
-rw-r--r-- | superkaramba/src/kwidgetlistbox.h | 2 | ||||
-rw-r--r-- | superkaramba/src/misc_python.h | 2 | ||||
-rw-r--r-- | superkaramba/src/sklineedit.cpp | 2 | ||||
-rw-r--r-- | superkaramba/src/systemtray.cpp | 4 | ||||
-rw-r--r-- | superkaramba/src/systemtray.h | 2 | ||||
-rw-r--r-- | superkaramba/src/taskmanager.cpp | 14 | ||||
-rw-r--r-- | superkaramba/src/taskmanager.h | 8 | ||||
-rw-r--r-- | superkaramba/src/themesdlg.cpp | 4 | ||||
-rw-r--r-- | superkaramba/src/themesdlg.h | 2 | ||||
-rw-r--r-- | superkaramba/src/themewidget.cpp | 4 | ||||
-rw-r--r-- | superkaramba/src/themewidget.h | 2 | ||||
-rw-r--r-- | superkaramba/src/widget_python.cpp | 2 | ||||
-rw-r--r-- | superkaramba/src/widget_python.h | 6 |
18 files changed, 39 insertions, 39 deletions
diff --git a/superkaramba/src/datesensor.cpp b/superkaramba/src/datesensor.cpp index 9db258f..56c9d31 100644 --- a/superkaramba/src/datesensor.cpp +++ b/superkaramba/src/datesensor.cpp @@ -48,8 +48,8 @@ void DateSensor::slotCalendarDeleted() } -DatePicker::DatePicker(TQWidget *tqparent) - : TQVBox( tqparent, 0, WType_TopLevel | WDestructiveClose | +DatePicker::DatePicker(TQWidget *parent) + : TQVBox( parent, 0, WType_TopLevel | WDestructiveClose | WStyle_Customize | WStyle_StaysOnTop | WStyle_NoBorder ) { setFrameStyle( TQFrame::PopupPanel | TQFrame::Raised ); diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp index ca6e2cc..5965355 100644 --- a/superkaramba/src/karamba.cpp +++ b/superkaramba/src/karamba.cpp @@ -1992,8 +1992,8 @@ void karamba::toggleWidgetUpdate( bool b) widgetUpdate = b; } -SignalBridge::SignalBridge(TQObject* tqparent, TQString name, KActionCollection* ac) - : TQObject(tqparent, name.ascii()), collection(ac) +SignalBridge::SignalBridge(TQObject* parent, TQString name, KActionCollection* ac) + : TQObject(parent, name.ascii()), collection(ac) { setName(name.ascii()); } @@ -2004,15 +2004,15 @@ void SignalBridge::receive() isChecked()); } -DesktopChangeSlot::DesktopChangeSlot(TQObject *tqparent, int id) - : TQObject(tqparent, "") +DesktopChangeSlot::DesktopChangeSlot(TQObject *parent, int id) + : TQObject(parent, "") { desktopid = id; } void DesktopChangeSlot::receive() { - karamba *k = (karamba *)tqparent(); + karamba *k = (karamba *)parent(); // XXX - check type cast diff --git a/superkaramba/src/karamba.h b/superkaramba/src/karamba.h index 7184f4c..a8088ff 100644 --- a/superkaramba/src/karamba.h +++ b/superkaramba/src/karamba.h @@ -330,7 +330,7 @@ class DesktopChangeSlot : public TQObject TQ_OBJECT public: - DesktopChangeSlot(TQObject *tqparent, int desktop_id); + DesktopChangeSlot(TQObject *parent, int desktop_id); /* Parent should be the karamba object * desktop id of 0 indicates all desktops */ void setMenuId(int id); @@ -351,7 +351,7 @@ class SignalBridge : public TQObject TQ_OBJECT public: - SignalBridge(TQObject* tqparent, TQString, KActionCollection*); + SignalBridge(TQObject* parent, TQString, KActionCollection*); signals: void enabled(TQString, bool); diff --git a/superkaramba/src/karamba_python.cpp b/superkaramba/src/karamba_python.cpp index 7f865d9..1538672 100644 --- a/superkaramba/src/karamba_python.cpp +++ b/superkaramba/src/karamba_python.cpp @@ -194,7 +194,7 @@ static PyMethodDef karamba_methods[] = { // Widget - widget_python.cpp {(char*)"moveWidget", py_move_widget, METH_VARARGS, (char*)"Move Widget to x,y"}, {(char*)"resizeWidget", py_resize_widget, METH_VARARGS, (char*)"Resize Widget to width,height"}, - {(char*)"createWidgetMask", py_create_widget_tqmask, METH_VARARGS, (char*)"Create a clipping tqmask for this widget"}, + {(char*)"createWidgetMask", py_create_widget_mask, METH_VARARGS, (char*)"Create a clipping mask for this widget"}, {(char*)"redrawWidget", py_redraw_widget, METH_VARARGS, (char*)"Update Widget to reflect your changes"}, {(char*)"redrawWidgetBackground", py_redraw_widget_background, METH_VARARGS, (char*)"Update Widget to reflect background image changes"}, {(char*)"getWidgetPosition", py_get_widget_position, METH_VARARGS, (char*)"Get Widget Position"}, diff --git a/superkaramba/src/kwidgetlistbox.cpp b/superkaramba/src/kwidgetlistbox.cpp index bca1deb..d22d3c8 100644 --- a/superkaramba/src/kwidgetlistbox.cpp +++ b/superkaramba/src/kwidgetlistbox.cpp @@ -21,8 +21,8 @@ #include <kdebug.h> #include <kglobalsettings.h> -KWidgetListbox::KWidgetListbox(TQWidget *tqparent, const char *name) - : TQTable(tqparent, name) +KWidgetListbox::KWidgetListbox(TQWidget *parent, const char *name) + : TQTable(parent, name) { setNumRows(0); setNumCols(1); diff --git a/superkaramba/src/kwidgetlistbox.h b/superkaramba/src/kwidgetlistbox.h index 78f899e..b1e4b25 100644 --- a/superkaramba/src/kwidgetlistbox.h +++ b/superkaramba/src/kwidgetlistbox.h @@ -34,7 +34,7 @@ class KWidgetListbox : public TQTable TQ_OBJECT public: - KWidgetListbox(TQWidget *tqparent = 0, const char *name = 0); + KWidgetListbox(TQWidget *parent = 0, const char *name = 0); ~KWidgetListbox(); int insertItem(TQWidget* item, int index = -1); diff --git a/superkaramba/src/misc_python.h b/superkaramba/src/misc_python.h index 9b89f60..46c0988 100644 --- a/superkaramba/src/misc_python.h +++ b/superkaramba/src/misc_python.h @@ -316,7 +316,7 @@ PyObject* py_get_number_of_desktops(PyObject *self, PyObject *args); * long translateAll(widget, relative_x, relative_y) * DESCRIPTION * Moves all widgets within a theme in a particular direction relative to -* the previous spot without moving the tqparent theme widget. +* the previous spot without moving the parent theme widget. * ARGUMENTS * * long widget -- karamba * * long translate_x -- move horizontally diff --git a/superkaramba/src/sklineedit.cpp b/superkaramba/src/sklineedit.cpp index f923fef..40b6d3e 100644 --- a/superkaramba/src/sklineedit.cpp +++ b/superkaramba/src/sklineedit.cpp @@ -66,7 +66,7 @@ void SKLineEdit::keyPressEvent(TQKeyEvent* e) if(!e->text().isEmpty()) { - karamba* k = static_cast<karamba*>(TQT_TQWIDGET(tqparent())); + karamba* k = static_cast<karamba*>(TQT_TQWIDGET(parent())); k->keyPressed(e->text(), m_input); } } diff --git a/superkaramba/src/systemtray.cpp b/superkaramba/src/systemtray.cpp index e5268fb..fbd4625 100644 --- a/superkaramba/src/systemtray.cpp +++ b/superkaramba/src/systemtray.cpp @@ -35,8 +35,8 @@ #include <X11/Xlib.h> -Systemtray::Systemtray(TQWidget* tqparent) - : TQWidget(tqparent,0,0) +Systemtray::Systemtray(TQWidget* parent) + : TQWidget(parent,0,0) { setBackgroundOrigin(ParentOrigin); setBackgroundMode(FixedPixmap); diff --git a/superkaramba/src/systemtray.h b/superkaramba/src/systemtray.h index 02870a8..7ff60ac 100644 --- a/superkaramba/src/systemtray.h +++ b/superkaramba/src/systemtray.h @@ -36,7 +36,7 @@ class Systemtray : public TQWidget Q_OBJECT TQ_OBJECT public: - Systemtray(TQWidget* tqparent); + Systemtray(TQWidget* parent); ~Systemtray(); void updateBackgroundPixmap ( const TQPixmap & ); diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp index 90f0efe..26a417e 100644 --- a/superkaramba/src/taskmanager.cpp +++ b/superkaramba/src/taskmanager.cpp @@ -40,7 +40,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. template class TQPtrList<Task>; -// Hack: create a global KWinModule without a tqparent. We +// Hack: create a global KWinModule without a parent. We // can't make it a child of TaskManager because more than one // TaskManager might be created. We can't make it a class // variable without changing Task, which also uses it. @@ -48,8 +48,8 @@ template class TQPtrList<Task>; // The real problem is that KWinModule should be a singleton. KWinModule* kwin_module = 0; -TaskManager::TaskManager(TQObject *tqparent, const char *name) - : TQObject(tqparent, name), _active(0), _startup_info( NULL ) +TaskManager::TaskManager(TQObject *parent, const char *name) + : TQObject(parent, name), _active(0), _startup_info( NULL ) { kwin_module = new KWinModule(); @@ -328,8 +328,8 @@ bool TaskManager::isOnTop(const Task* task) } -Task::Task(WId win, TaskManager * tqparent, const char *name) : - TQObject(tqparent, name), +Task::Task(WId win, TaskManager * parent, const char *name) : + TQObject(parent, name), _active(false), _win(win), _lastWidth(0), _lastHeight(0), _lastResize(false), _lastIcon(), _thumbSize(0.2), _thumb(), _grab() @@ -803,8 +803,8 @@ void Task::generateThumbnail() } Startup::Startup( const KStartupInfoId& id, const KStartupInfoData& data, - TQObject * tqparent, const char *name) - : TQObject(tqparent, name), _id( id ), _data( data ) + TQObject * parent, const char *name) + : TQObject(parent, name), _id( id ), _data( data ) { } diff --git a/superkaramba/src/taskmanager.h b/superkaramba/src/taskmanager.h index 70cff97..0daac31 100644 --- a/superkaramba/src/taskmanager.h +++ b/superkaramba/src/taskmanager.h @@ -70,10 +70,10 @@ class Task: public TQObject TQ_PROPERTY( TQPixmap thumbnail READ thumbnail ) public: - Task( WId win, TaskManager * tqparent, const char *name = 0 ); + Task( WId win, TaskManager * parent, const char *name = 0 ); virtual ~Task(); - TaskManager* taskManager() const { return (TaskManager*) tqparent(); } + TaskManager* taskManager() const { return (TaskManager*) parent(); } WId window() const { return _win; } #ifdef KDE_3_2 @@ -382,7 +382,7 @@ class Startup: public TQObject TQ_PROPERTY( TQString icon READ icon ) public: - Startup( const KStartupInfoId& id, const KStartupInfoData& data, TQObject * tqparent, + Startup( const KStartupInfoId& id, const KStartupInfoData& data, TQObject * parent, const char *name = 0); virtual ~Startup(); @@ -437,7 +437,7 @@ class TaskManager : public TQObject TQ_PROPERTY( int numberOfDesktops READ numberOfDesktops ) public: - TaskManager( TQObject *tqparent = 0, const char *name = 0 ); + TaskManager( TQObject *parent = 0, const char *name = 0 ); virtual ~TaskManager(); /** diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp index bf4cd93..555ad48 100644 --- a/superkaramba/src/themesdlg.cpp +++ b/superkaramba/src/themesdlg.cpp @@ -51,8 +51,8 @@ #include <kio/job.h> #include <kprotocolinfo.h> -ThemesDlg::ThemesDlg(TQWidget *tqparent, const char *name) - : ThemesLayout(tqparent, name) +ThemesDlg::ThemesDlg(TQWidget *parent, const char *name) + : ThemesLayout(parent, name) { populateListbox(); #ifdef HAVE_KNEWSTUFF diff --git a/superkaramba/src/themesdlg.h b/superkaramba/src/themesdlg.h index 200dca2..bf4fab5 100644 --- a/superkaramba/src/themesdlg.h +++ b/superkaramba/src/themesdlg.h @@ -43,7 +43,7 @@ class ThemesDlg : public ThemesLayout TQ_OBJECT public: - ThemesDlg(TQWidget *tqparent = 0, const char *name = 0); + ThemesDlg(TQWidget *parent = 0, const char *name = 0); ~ThemesDlg(); int addTheme(const TQString &appId, const TQString &file); diff --git a/superkaramba/src/themewidget.cpp b/superkaramba/src/themewidget.cpp index 8eab4d0..3addd2a 100644 --- a/superkaramba/src/themewidget.cpp +++ b/superkaramba/src/themewidget.cpp @@ -25,8 +25,8 @@ #include <tqlabel.h> #include <tqlayout.h> -ThemeWidget::ThemeWidget(TQWidget *tqparent, const char *name) - : ThemeWidgetLayout(tqparent, name), m_themeFile(0) +ThemeWidget::ThemeWidget(TQWidget *parent, const char *name) + : ThemeWidgetLayout(parent, name), m_themeFile(0) { running->setText(""); setDescriptionMaxHeight(); diff --git a/superkaramba/src/themewidget.h b/superkaramba/src/themewidget.h index 10e557d..40cefe5 100644 --- a/superkaramba/src/themewidget.h +++ b/superkaramba/src/themewidget.h @@ -32,7 +32,7 @@ class ThemeWidget : public ThemeWidgetLayout Q_OBJECT TQ_OBJECT public: - ThemeWidget(TQWidget *tqparent = 0, const char *name = 0); + ThemeWidget(TQWidget *parent = 0, const char *name = 0); ThemeWidget(ThemeFile* tf); ~ThemeWidget(); diff --git a/superkaramba/src/widget_python.cpp b/superkaramba/src/widget_python.cpp index ad545f3..564b4b4 100644 --- a/superkaramba/src/widget_python.cpp +++ b/superkaramba/src/widget_python.cpp @@ -86,7 +86,7 @@ long createWidgetMask(long widget, char* path) return (long)currTheme->widgetMask; } -PyObject* py_create_widget_tqmask(PyObject *, PyObject *args) +PyObject* py_create_widget_mask(PyObject *, PyObject *args) { long widget; char *text; diff --git a/superkaramba/src/widget_python.h b/superkaramba/src/widget_python.h index e54c31d..97cc263 100644 --- a/superkaramba/src/widget_python.h +++ b/superkaramba/src/widget_python.h @@ -42,17 +42,17 @@ PyObject* py_get_widget_position(PyObject *self, PyObject *args); /** Widget/createWidgetMask * * SYNOPSIS -* long createWidgetMask(widget, tqmask) +* long createWidgetMask(widget, mask) * DESCRIPTION * This function doesn't work currently due to a bug in KDE. Please use * MASK= in your .theme file for the time being. * ARGUMENTS * * long widget -- karamba -* * string tqmask -- The name of the widget tqmask file. +* * string mask -- The name of the widget mask file. * RETURN VALUE * 1 if successful */ -PyObject* py_create_widget_tqmask(PyObject *self, PyObject *args); +PyObject* py_create_widget_mask(PyObject *self, PyObject *args); /** Widget/redrawWidgetBackground * |