diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
commit | dfb7562b7e607f0ae077a6a436966203029df56d (patch) | |
tree | d58abf870c3754458d44a192a0b9e186f506c4ed /karm | |
parent | fc5197ec86abe5dc0fa4b48979684845b52357f2 (diff) | |
download | tdepim-dfb7562b7e607f0ae077a6a436966203029df56d.tar.gz tdepim-dfb7562b7e607f0ae077a6a436966203029df56d.zip |
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'karm')
-rw-r--r-- | karm/csvexportdialog_base.ui | 2 | ||||
-rw-r--r-- | karm/karm_part.cpp | 12 | ||||
-rw-r--r-- | karm/karm_part.h | 4 | ||||
-rw-r--r-- | karm/karmstorage.cpp | 16 | ||||
-rw-r--r-- | karm/karmstorage.h | 2 | ||||
-rw-r--r-- | karm/plannerparser.cpp | 8 | ||||
-rw-r--r-- | karm/plannerparser.h | 2 |
7 files changed, 23 insertions, 23 deletions
diff --git a/karm/csvexportdialog_base.ui b/karm/csvexportdialog_base.ui index c4ac2c65a..906ba139b 100644 --- a/karm/csvexportdialog_base.ui +++ b/karm/csvexportdialog_base.ui @@ -405,7 +405,7 @@ <Q_SLOTS> <slot>enableExportButton()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdateedit.h</includehint> <includehint>kdateedit.h</includehint> diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index abe8fed61..dca3cf94e 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -21,17 +21,17 @@ #include <tqpopupmenu.h> #include "mainwindow.h" -karmPart::karmPart( TQWidget *tqparentWidget, const char *widgetName, +karmPart::karmPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name ) : DCOPObject ( "KarmDCOPIface" ), KParts::ReadWritePart(tqparent, name), - _accel ( new KAccel( tqparentWidget ) ), - _watcher ( new KAccelMenuWatch( _accel, TQT_TQOBJECT(tqparentWidget) ) ) + _accel ( new KAccel( parentWidget ) ), + _watcher ( new KAccelMenuWatch( _accel, TQT_TQOBJECT(parentWidget) ) ) { // we need an instance setInstance( karmPartFactory::instance() ); // this should be your custom internal widget - _taskView = new TaskView( tqparentWidget, widgetName ); + _taskView = new TaskView( parentWidget, widgetName ); // setup PreferenceDialog. _preferences = Preferences::instance(); @@ -387,12 +387,12 @@ karmPartFactory::~karmPartFactory() s_instance = 0L; } -KParts::Part* karmPartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, +KParts::Part* karmPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const char *classname, const TQStringList &args ) { // Create an instance of our Part - karmPart* obj = new karmPart( tqparentWidget, widgetName, tqparent, name ); + karmPart* obj = new karmPart( parentWidget, widgetName, tqparent, name ); // See if we are to be read-write or not if (TQCString(classname) == "KParts::ReadOnlyPart") diff --git a/karm/karm_part.h b/karm/karm_part.h index bca83e32e..8550cc9b3 100644 --- a/karm/karm_part.h +++ b/karm/karm_part.h @@ -59,7 +59,7 @@ class karmPart : public KParts::ReadWritePart, virtual public KarmDCOPIface friend class KarmTray; public: - karmPart(TQWidget *tqparentWidget, const char *widgetName, + karmPart(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name); // DCOP void quit(); @@ -126,7 +126,7 @@ class karmPartFactory : public KParts::Factory public: karmPartFactory(); virtual ~karmPartFactory(); - virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName, + virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const char *classname, const TQStringList &args ); static KInstance* instance(); diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp index d56dff0b2..6211deb84 100644 --- a/karm/karmstorage.cpp +++ b/karm/karmstorage.cpp @@ -102,7 +102,7 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt // If file doesn't exist, create a blank one to avoid ResourceLocal load // error. We make it user and group read/write, others read. This is - // tqmasked by the users umask. (See man creat) + // masked by the users umask. (See man creat) if ( ! remoteResource( _icalfile ) ) { int handle; @@ -310,11 +310,11 @@ TQString KarmStorage::save(TaskView* taskview) kdDebug(5970) << "entering KarmStorage::save" << endl; TQString err=TQString(); - TQPtrStack< KCal::Todo > tqparents; + TQPtrStack< KCal::Todo > parents; for (Task* task=taskview->first_child(); task; task = task->nextSibling()) { - err=writeTaskAsTodo(task, 1, tqparents ); + err=writeTaskAsTodo(task, 1, parents ); } if ( !saveCalendar() ) @@ -337,7 +337,7 @@ TQString KarmStorage::save(TaskView* taskview) } TQString KarmStorage::writeTaskAsTodo(Task* task, const int level, - TQPtrStack< KCal::Todo >& tqparents ) + TQPtrStack< KCal::Todo >& parents ) { TQString err; KCal::Todo* todo; @@ -349,16 +349,16 @@ TQString KarmStorage::writeTaskAsTodo(Task* task, const int level, return "Could not get todo from calendar"; } task->asTodo(todo); - if ( !tqparents.isEmpty() ) todo->setRelatedTo( tqparents.top() ); - tqparents.push( todo ); + if ( !parents.isEmpty() ) todo->setRelatedTo( parents.top() ); + parents.push( todo ); for ( Task* nextTask = task->firstChild(); nextTask; nextTask = nextTask->nextSibling() ) { - err = writeTaskAsTodo(nextTask, level+1, tqparents ); + err = writeTaskAsTodo(nextTask, level+1, parents ); } - tqparents.pop(); + parents.pop(); return err; } diff --git a/karm/karmstorage.h b/karm/karmstorage.h index 214dab53e..40c574d7f 100644 --- a/karm/karmstorage.h +++ b/karm/karmstorage.h @@ -308,7 +308,7 @@ class KarmStorage bool parseLine(TQString line, long *time, TQString *name, int *level, DesktopList* desktopList); TQString writeTaskAsTodo - (Task* task, const int level, TQPtrStack< KCal::Todo >& tqparents); + (Task* task, const int level, TQPtrStack< KCal::Todo >& parents); bool saveCalendar(); KCal::Event* baseEvent(const Task*); diff --git a/karm/plannerparser.cpp b/karm/plannerparser.cpp index a1f83eb2a..b205fd7af 100644 --- a/karm/plannerparser.cpp +++ b/karm/plannerparser.cpp @@ -67,13 +67,13 @@ test cases: } // at the moment, task is still the old task or the old father task (if an endElement occurred) or not existing (if the - // new task is a top-level-task). Make task the tqparenttask, if existing. + // new task is a top-level-task). Make task the parenttask, if existing. DesktopList dl; if (level++>0) { - tqparentTask=task; - task = new Task(taskName, 0, 0, dl, tqparentTask); - task->setUid(_taskView->storage()->addTask(task, tqparentTask)); + parentTask=task; + task = new Task(taskName, 0, 0, dl, parentTask); + task->setUid(_taskView->storage()->addTask(task, parentTask)); } else { diff --git a/karm/plannerparser.h b/karm/plannerparser.h index 9334b8a5c..c5294b8d3 100644 --- a/karm/plannerparser.h +++ b/karm/plannerparser.h @@ -54,7 +54,7 @@ private: bool withInTasks; // within <tasks> ? TaskView *_taskView; Task *task; - Task *tqparentTask; + Task *parentTask; int level; // level=1: task is top-level-task }; |