← Back to branch summary

~ubuntu-branches/ubuntu/precise/koffice/precise

« back to all changes in this revision

Viewing changes to kexi/core/kexisharedactionhost.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2010-10-27 17:52:57 UTC
  • mfrom: (0.12.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20101027175257-s04zqqk5bs8ckm9o
Tags: 1:2.2.83-0ubuntu1
* Merge with Debian git remaining changes:
 - Add build-deps on librcps-dev, opengtl-dev, libqtgtl-dev, freetds-dev,
   create-resources, libspnav-dev
 - Remove needless build-dep on libwv2-dev
 - koffice-libs recommends create-resources
 - krita recommends pstoedit
 - Keep our patches
* New upstream release 2.3 beta 3
  - Remove debian/patches fixed by upstream
  - Update install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
kexi/core/kexisharedactionhost.cpp
211
211
    return 0;
212
212
}
213
213
 
 
214
#if 0 // 2.x
214
215
bool KexiSharedActionHost::acceptsSharedActions(QObject *)
215
216
{
216
217
    return false;
217
218
}
 
219
#endif
 
220
 
 
221
QWidget* KexiSharedActionHost::findWindow(QWidget *w)
 
222
{
 
223
    return 0;
 
224
}
218
225
 
219
226
QWidget* KexiSharedActionHost::focusWindow()
220
227
{
235
242
    if (!aw)
236
243
        aw = dynamic_cast<QWidget*>(d->mainWin);
237
244
    QWidget *fw = aw->focusWidget();
238
 
    while (fw && !acceptsSharedActions(fw))
 
245
    return findWindow(fw);
 
246
/*2.x    while (fw && !acceptsSharedActions(fw))
239
247
        fw = fw->parentWidget();
240
 
    return fw;
 
248
    return fw;*/
241
249
#endif
242
250
}
243
251